diff --git a/data/y-web/languages/Czech b/data/y-web/languages/Czech
index 53670179b..e5a64e062 100644
--- a/data/y-web/languages/Czech
+++ b/data/y-web/languages/Czech
@@ -87,7 +87,7 @@ bc.menue.remote_desc=Webový Dálkový ovladač
bc.menue.remote=Ovladač
bc.menue.lcd_screenshot_desc=Vytvoří obrázek OSD zobrazení v mřížce
bc.menue.lcd_screenshot=Zesnímání OSD obrazovky
-bc.menue.lcd_screenshot_desc_ni=lcshot není inštalovaný v /bin nebo /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot není inštalovaný
bc.menue.screenshot=Zesnímání TV obrazovky
bc.menue.screenshot_desc=vytvoří obrázek z osd a/nebo TV bez mřižky
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index 267a055de..07c962a00 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -108,7 +108,7 @@ bc.menue.glcd_screenshot_desc=GLCD Screenshot erstellen
bc.menue.glcd_screenshot=GLCD Screenshot
bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen
bc.menue.lcd_screenshot=LCD Screenshot
-bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in
bc.menue.screenshot=Screenshot
bc.menue.screenshot_desc=Screenshot des OSDs und/oder des TV-Bildes erstellen
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index 2306f6b1a..25bfcbbb2 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -110,7 +110,7 @@ bc.menue.glcd_screenshot_desc=take a GLCD screenshot
bc.menue.glcd_screenshot=GLCD Screenshot
bc.menue.lcd_screenshot_desc=take a lcd screenshot
bc.menue.lcd_screenshot=LCD Screenshot
-bc.menue.lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot not installed
bc.menue.screenshot=Screenshot
bc.menue.screenshot_desc=make screenshots from OSD and/or TV
diff --git a/data/y-web/languages/Polski b/data/y-web/languages/Polski
index a3db1e5b2..4fd18760f 100644
--- a/data/y-web/languages/Polski
+++ b/data/y-web/languages/Polski
@@ -89,7 +89,7 @@ bc.menue.remote_desc=Pilot zdalnego sterowania
bc.menue.remote=Pilot
bc.menue.lcd_screenshot_desc=Tworzenie zrzutu ekranu LCD
bc.menue.lcd_screenshot=Zrzut ekranu LCD
-bc.menue.lcd_screenshot_desc_ni=lcshot nie jest zainstalowane w katalogu /bin lub /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot nie jest zainstalowane
bc.menue.screenshot=Zrzut ekranu
bc.menue.screenshot_desc=Zrzut ekranu OSD i/lub obrazu telewizyjnego
diff --git a/data/y-web/languages/Portuguese b/data/y-web/languages/Portuguese
index 37d51e692..9753535a2 100644
--- a/data/y-web/languages/Portuguese
+++ b/data/y-web/languages/Portuguese
@@ -84,15 +84,15 @@ bc.menue.remote_desc=Remote Control baseado em Web
bc.menue.remote=Remote
bc.menue.lcd_screenshot_desc=fazer um lcd screenshot
bc.menue.lcd_screenshot=LCD Screenshot
-bc.menue.lcd_screenshot_desc_ni=lcshot não se encontra instalado em /bin ou /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot não se encontra instalado
bc.menue.osd_screenshot_desc=fazer um osd screenshot
bc.menue.osd_screenshot=OSD Screenshot
-bc.menue.osd_screenshot_desc_ni=fbshot não se encontra instalado em /bin ou /var/bin
+bc.menue.osd_screenshot_desc_ni=fbshot não se encontra instalado
bc.menue.tv_screenshot_desc=frazer um tv screenshot
bc.menue.tv_screenshot=TV Screenshot
bc.menue.remote_osd_desc=remote e osd
bc.menue.remote_osd=Remote & OSD
-bc.menue.remote_osd_desc_ni=dboxshot não se encontra instalado em /bin ou /var/bin
+bc.menue.remote_osd_desc_ni=dboxshot não se encontra instalado
bc.menue.decrease_volume=diminuir volume
bc.menue.increase_volume=aumentar volume
diff --git a/data/y-web/languages/Slovak b/data/y-web/languages/Slovak
index 1c82fbf19..e4758fc87 100644
--- a/data/y-web/languages/Slovak
+++ b/data/y-web/languages/Slovak
@@ -106,7 +106,7 @@ bc.menue.remote_desc=Webovský Diaľkový ovládač
bc.menue.remote=Ovládač
bc.menue.lcd_screenshot_desc=Vytvorí obrázok OSD zobrazenia v mierke
bc.menue.lcd_screenshot=Zosnímanie OSD obrazovky
-bc.menue.lcd_screenshot_desc_ni=lcshot nie je inštalovaný v /bin alebo /var/bin
+bc.menue.lcd_screenshot_desc_ni=lcshot nie je inštalovaný
bc.menue.screenshot=Zosnímanie TV obrazovky
bc.menue.screenshot_desc=Vytvorí obrázok z osd a/alebo TV bez mierky
diff --git a/data/y-web/scripts/Y_NI_Plugin-control.sh b/data/y-web/scripts/Y_NI_Plugin-control.sh
index 7f90c8db8..09ae32e9d 100644
--- a/data/y-web/scripts/Y_NI_Plugin-control.sh
+++ b/data/y-web/scripts/Y_NI_Plugin-control.sh
@@ -15,121 +15,121 @@ case "$1" in
fcm_start)
echo "[$BNAME] fritzcallmonitor start"
touch /var/etc/.fritzcallmonitor
- $y_path_sbin/service fritzcallmonitor start >/dev/console
+ service fritzcallmonitor start >/dev/console
;;
fcm_stop)
echo "[$BNAME] fritzcallmonitor stop"
- $y_path_sbin/service fritzcallmonitor stop >/dev/console
+ service fritzcallmonitor stop >/dev/console
rm -f /var/etc/.fritzcallmonitor
;;
nfs_start)
echo "[$BNAME] nfs-server start"
touch /var/etc/.nfsd
- $y_path_sbin/service nfsd start >/dev/console
+ service nfsd start >/dev/console
;;
nfs_stop)
echo "[$BNAME] nfs-server stop"
- $y_path_sbin/service nfsd stop >/dev/console
+ service nfsd stop >/dev/console
rm -f /var/etc/.nfsd
;;
smb_start)
echo "[$BNAME] samba-server start"
touch /var/etc/.samba
- $y_path_sbin/service samba start >/dev/console
+ service samba start >/dev/console
;;
smb_stop)
echo "[$BNAME] samba-server stop"
- $y_path_sbin/service samba stop >/dev/console
+ service samba stop >/dev/console
rm -f /var/etc/.samba
;;
txc_start)
echo "[$BNAME] tuxcal start"
touch /var/etc/.tuxcald
- $y_path_sbin/service tuxcald start >/dev/console
+ service tuxcald start >/dev/console
;;
txc_stop)
echo "[$BNAME] tuxcal stop"
- $y_path_sbin/service tuxcald stop >/dev/console
+ service tuxcald stop >/dev/console
rm -f /var/etc/.tuxcald
;;
txm_start)
echo "[$BNAME] tuxmail start"
touch /var/etc/.tuxmaild
- $y_path_sbin/service tuxmaild start >/dev/console
+ service tuxmaild start >/dev/console
;;
txm_stop)
echo "[$BNAME] tuxmail stop"
- $y_path_sbin/service tuxmaild stop >/dev/console
+ service tuxmaild stop >/dev/console
rm -f /var/etc/.tuxmaild
;;
ina_start)
echo "[$BNAME] inadyn start"
touch /var/etc/.inadyn
- $y_path_sbin/service inadyn start >/dev/console
+ service inadyn start >/dev/console
;;
ina_stop)
echo "[$BNAME] inadyn stop"
- $y_path_sbin/service inadyn stop >/dev/console
+ service inadyn stop >/dev/console
rm -f /var/etc/.inadyn
;;
drop_start)
echo "[$BNAME] dropbear start"
touch /var/etc/.dropbear
- $y_path_sbin/service dropbear start >/dev/console
+ service dropbear start >/dev/console
;;
drop_stop)
echo "[$BNAME] dropbear stop"
- $y_path_sbin/service dropbear stop >/dev/console
+ service dropbear stop >/dev/console
rm -f /var/etc/.dropbear
;;
ush_start)
echo "[$BNAME] ushare start"
touch /var/etc/.ushare
- $y_path_sbin/service ushare start >/dev/console
+ service ushare start >/dev/console
;;
ush_stop)
echo "[$BNAME] ushare stop"
- $y_path_sbin/service ushare stop >/dev/console
+ service ushare stop >/dev/console
rm -f /var/etc/.ushare
;;
djm_start)
echo "[$BNAME] djmount start"
touch /var/etc/.djmount
- $y_path_sbin/service djmount start >/dev/console
+ service djmount start >/dev/console
;;
djm_stop)
echo "[$BNAME] djmount stop"
- $y_path_sbin/service djmount stop >/dev/console
+ service djmount stop >/dev/console
rm -f /var/etc/.djmount
;;
minidlna_start)
echo "[$BNAME] minidlna start"
touch /var/etc/.minidlnad
- $y_path_sbin/service minidlnad start >/dev/console
+ service minidlnad start >/dev/console
;;
minidlna_stop)
echo "[$BNAME] minidlna stop"
- $y_path_sbin/service minidlnad stop >/dev/console
+ service minidlnad stop >/dev/console
rm -f /var/etc/.minidlnad
;;
xud_start)
echo "[$BNAME] xupnpd start"
touch /var/etc/.xupnpd
- $y_path_sbin/service xupnpd start >/dev/console
+ service xupnpd start >/dev/console
;;
xud_stop)
echo "[$BNAME] xupnpd stop"
- $y_path_sbin/service xupnpd stop >/dev/console
+ service xupnpd stop >/dev/console
rm -f /var/etc/.xupnpd
;;
cro_start)
echo "[$BNAME] crond start"
touch /var/etc/.crond
- $y_path_sbin/service crond start >/dev/console
+ service crond start >/dev/console
;;
cro_stop)
echo "[$BNAME] crond stop"
- $y_path_sbin/service crond stop >/dev/console
+ service crond stop >/dev/console
rm -f /var/etc/.crond
;;
*)
diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh
index 93701813b..0028725a8 100644
--- a/data/y-web/scripts/Y_Tools.sh
+++ b/data/y-web/scripts/Y_Tools.sh
@@ -459,9 +459,7 @@ proc()
# -----------------------------------------------------------
wol()
{
- if [ -e $y_path_sbin/ether-wake ]; then
- msg=`ether-wake $1`
- fi
+ msg=`ether-wake $1`
msg="Wake on LAN $1
$msg"
y_format_message_html
}
@@ -474,7 +472,7 @@ do_lcshot()
if [ -e "$y_path_varbin/lcshot" ]; then
$y_path_varbin/lcshot $*
else
- $y_path_bin/lcshot $*
+ lcshot $*
fi
}
# -----------------------------------------------------------
@@ -525,7 +523,7 @@ do_settings_backup_restore()
backup)
rm -rf $workdir
mkdir -p $workdir
- $y_path_bin/backup.sh $workdir >/dev/null
+ backup.sh $workdir >/dev/null
filename=$(ls -1 -tr $workdir/settings_* | tail -1)
echo "$filename"
;;
@@ -533,7 +531,7 @@ do_settings_backup_restore()
restore)
if [ -s "$y_upload_file" ]
then
- msg=$($y_path_bin/restore.sh "$y_upload_file")
+ msg=$(restore.sh "$y_upload_file")
else
msg="error: no upload file"
fi
diff --git a/data/y-web/scripts/_Y_Globals.sh b/data/y-web/scripts/_Y_Globals.sh
index db9fa047c..4fe150b04 100644
--- a/data/y-web/scripts/_Y_Globals.sh
+++ b/data/y-web/scripts/_Y_Globals.sh
@@ -17,8 +17,10 @@ boxtype="coolstream"
y_path_httpd=".."
y_path_scripts="$y_path_httpd/scripts"
y_path_bin="/bin"
+y_path_usrbin="/usr/bin"
y_path_varbin="/var/bin"
y_path_sbin="/sbin"
+y_path_usrsbin="/usr/sbin"
y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp"
y_path_zapit="$y_path_config/zapit"
diff --git a/data/y-web/scripts/api.sh b/data/y-web/scripts/api.sh
index 126907f1c..e408574d6 100644
--- a/data/y-web/scripts/api.sh
+++ b/data/y-web/scripts/api.sh
@@ -12,8 +12,10 @@ API_VERSION_TEXT="$API_VERSION_MAJOR.$API_VERSION_MINOR"
path_httpd=".."
path_scripts="$path_httpd/scripts"
path_bin="/bin"
+path_usrbin="/usr/bin"
path_varbin="/var/bin"
path_sbin="/sbin"
+path_usrsbin="/usr/sbin"
path_config="%(CONFIGDIR)"
path_tmp="/tmp"
@@ -27,9 +29,7 @@ do_udp_stream()
if [ -e $path_varbin/udpstreamts ]; then
up="$path_varbin/udpstreamts"
else
- if [ -e $path_sbin/udpstreamts ]; then
- up="$path_sbin/udpstreamts"
- fi
+ up="udpstreamts"
fi
case "$1" in