diff --git a/src/nhttpd/web/extentions/boxinfo/install.sh b/src/nhttpd/web/extentions/boxinfo/install.sh index e72827acf..7719d2fe2 100755 --- a/src/nhttpd/web/extentions/boxinfo/install.sh +++ b/src/nhttpd/web/extentions/boxinfo/install.sh @@ -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)" diff --git a/src/nhttpd/web/extentions/boxinfo/uninstall.sh b/src/nhttpd/web/extentions/boxinfo/uninstall.sh index f33ca7680..e4024ba3d 100755 --- a/src/nhttpd/web/extentions/boxinfo/uninstall.sh +++ b/src/nhttpd/web/extentions/boxinfo/uninstall.sh @@ -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)" diff --git a/src/nhttpd/web/extentions/hddtools/install.sh b/src/nhttpd/web/extentions/hddtools/install.sh index e72827acf..7719d2fe2 100755 --- a/src/nhttpd/web/extentions/hddtools/install.sh +++ b/src/nhttpd/web/extentions/hddtools/install.sh @@ -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)" diff --git a/src/nhttpd/web/extentions/hddtools/uninstall.sh b/src/nhttpd/web/extentions/hddtools/uninstall.sh index f33ca7680..e4024ba3d 100755 --- a/src/nhttpd/web/extentions/hddtools/uninstall.sh +++ b/src/nhttpd/web/extentions/hddtools/uninstall.sh @@ -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)" diff --git a/src/nhttpd/web/scripts/Y_Live.sh b/src/nhttpd/web/scripts/Y_Live.sh index 3b08c4cfa..caa7f02cb 100755 --- a/src/nhttpd/web/scripts/Y_Live.sh +++ b/src/nhttpd/web/scripts/Y_Live.sh @@ -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 diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index 25654c02c..a65ecf490 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -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 diff --git a/src/nhttpd/web/scripts/_Y_Globals.sh b/src/nhttpd/web/scripts/_Y_Globals.sh index 095578538..db9fa047c 100755 --- a/src/nhttpd/web/scripts/_Y_Globals.sh +++ b/src/nhttpd/web/scripts/_Y_Globals.sh @@ -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" diff --git a/src/nhttpd/web/scripts/api.sh b/src/nhttpd/web/scripts/api.sh index 4dc47d2e0..126907f1c 100755 --- a/src/nhttpd/web/scripts/api.sh +++ b/src/nhttpd/web/scripts/api.sh @@ -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"