yWeb: internal rename path_usrbin -> path_varbin

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9976307997
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)

Origin message was:
------------------
- yWeb: internal rename path_usrbin -> path_varbin

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-01 11:06:11 +02:00
parent 2da45995c7
commit a760d627d8
8 changed files with 16 additions and 16 deletions

View File

@@ -16,7 +16,7 @@ yI_Version="$Revision: 1.3 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_varbin="/var/bin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"
y_ywebover_dir="%(PUBLIC_HTTPDDIR)"

View File

@@ -16,7 +16,7 @@ yI_Version="$Revision: 1.4 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_varbin="/var/bin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"
y_ywebover_dir="%(PUBLIC_HTTPDDIR)"

View File

@@ -16,7 +16,7 @@ yI_Version="$Revision: 1.3 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_varbin="/var/bin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"
y_ywebover_dir="%(PUBLIC_HTTPDDIR)"

View File

@@ -16,7 +16,7 @@ yI_Version="$Revision: 1.4 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_varbin="/var/bin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"
y_ywebover_dir="%(PUBLIC_HTTPDDIR)"

View File

@@ -95,9 +95,9 @@ case "$1" in
killall streamts
killall streampes
killall udpstreamts
if [ -e $y_path_usrbin/udpstreamts ]
if [ -e $y_path_varbin/udpstreamts ]
then
$y_path_usrbin/udpstreamts $* &
$y_path_varbin/udpstreamts $* &
else
udpstreamts $* &
fi

View File

@@ -471,8 +471,8 @@ wol()
# -----------------------------------------------------------
do_lcshot()
{
if [ -e "$y_path_usrbin/lcshot" ]; then
$y_path_usrbin/lcshot $*
if [ -e "$y_path_varbin/lcshot" ]; then
$y_path_varbin/lcshot $*
else
$y_path_bin/lcshot $*
fi
@@ -485,15 +485,15 @@ do_fbshot()
{
if [ "$1" = "fb" ]; then
shift 1
if [ -e "$y_path_usrbin/fbshot" ]; then
$y_path_usrbin/fbshot $*
if [ -e "$y_path_varbin/fbshot" ]; then
$y_path_varbin/fbshot $*
else
fbshot $*
fi
else
shift 1
if [ -e "$y_path_usrbin/dboxshot" ]; then
$y_path_usrbin/dboxshot $*
if [ -e "$y_path_varbin/dboxshot" ]; then
$y_path_varbin/dboxshot $*
else
dboxshot $*
fi

View File

@@ -17,7 +17,7 @@ boxtype="coolstream"
y_path_httpd=".."
y_path_scripts="$y_path_httpd/scripts"
y_path_bin="/bin"
y_path_usrbin="/var/bin"
y_path_varbin="/var/bin"
y_path_sbin="/sbin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"

View File

@@ -12,7 +12,7 @@ API_VERSION_TEXT="$API_VERSION_MAJOR.$API_VERSION_MINOR"
path_httpd=".."
path_scripts="$path_httpd/scripts"
path_bin="/bin"
path_usrbin="/var/bin"
path_varbin="/var/bin"
path_sbin="/sbin"
path_config="%(CONFIGDIR)"
path_tmp="/tmp"
@@ -24,8 +24,8 @@ streaming_client_status="$path_tmp/streaming_client"
do_udp_stream()
{
up="no"
if [ -e $path_usrbin/udpstreamts ]; then
up="$path_usrbin/udpstreamts"
if [ -e $path_varbin/udpstreamts ]; then
up="$path_varbin/udpstreamts"
else
if [ -e $path_sbin/udpstreamts ]; then
up="$path_sbin/udpstreamts"