diff --git a/src/nhttpd/web/scripts/Y_NI_Camd-control.sh b/src/nhttpd/web/scripts/Y_NI_Camd-control.sh index 81ba8da01..4ed92955e 100644 --- a/src/nhttpd/web/scripts/Y_NI_Camd-control.sh +++ b/src/nhttpd/web/scripts/Y_NI_Camd-control.sh @@ -1,4 +1,8 @@ #!/bin/sh + +. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh +. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh + BNAME=${0##*/} case "$1" in diff --git a/src/nhttpd/web/scripts/Y_NI_Plugin-control.sh b/src/nhttpd/web/scripts/Y_NI_Plugin-control.sh index 78b11db0d..8036ea6cb 100644 --- a/src/nhttpd/web/scripts/Y_NI_Plugin-control.sh +++ b/src/nhttpd/web/scripts/Y_NI_Plugin-control.sh @@ -1,4 +1,8 @@ #!/bin/sh + +. %(PRIVATE_HTTPDDIR)/scripts/_Y_Globals.sh +. %(PRIVATE_HTTPDDIR)/scripts/_Y_Library.sh + BNAME=${0##*/} case "$1" in @@ -11,111 +15,111 @@ case "$1" in fcm_start) echo "[$BNAME] fritzcallmonitor start" touch /var/etc/.fritzcallmonitor - /sbin/service fritzcallmonitor start >/dev/console + $y_path_sbin/service fritzcallmonitor start >/dev/console ;; fcm_stop) echo "[$BNAME] fritzcallmonitor stop" - /sbin/service fritzcallmonitor stop >/dev/console + $y_path_sbin/service fritzcallmonitor stop >/dev/console rm -f /var/etc/.fritzcallmonitor ;; nfs_start) echo "[$BNAME] nfs-server start" touch /var/etc/.nfsd - /sbin/service nfsd start >/dev/console + $y_path_sbin/service nfsd start >/dev/console ;; nfs_stop) echo "[$BNAME] nfs-server stop" - /sbin/service nfsd stop >/dev/console + $y_path_sbin/service nfsd stop >/dev/console rm -f /var/etc/.nfsd ;; smb_start) echo "[$BNAME] samba-server start" touch /var/etc/.samba - /sbin/service samba start >/dev/console + $y_path_sbin/service samba start >/dev/console ;; smb_stop) echo "[$BNAME] samba-server stop" - /sbin/service samba stop >/dev/console + $y_path_sbin/service samba stop >/dev/console rm -f /var/etc/.samba ;; txc_start) echo "[$BNAME] tuxcal start" touch /var/etc/.tuxcald - /sbin/service tuxcald start >/dev/console + $y_path_sbin/service tuxcald start >/dev/console ;; txc_stop) echo "[$BNAME] tuxcal stop" - /sbin/service tuxcald stop >/dev/console + $y_path_sbin/service tuxcald stop >/dev/console rm -f /var/etc/.tuxcald ;; txm_start) echo "[$BNAME] tuxmail start" touch /var/etc/.tuxmaild - /sbin/service tuxmaild start >/dev/console + $y_path_sbin/service tuxmaild start >/dev/console ;; txm_stop) echo "[$BNAME] tuxmail stop" - /sbin/service tuxmaild stop >/dev/console + $y_path_sbin/service tuxmaild stop >/dev/console rm -f /var/etc/.tuxmaild ;; ina_start) echo "[$BNAME] inadyn start" touch /var/etc/.inadyn - /sbin/service inadyn start >/dev/console + $y_path_sbin/service inadyn start >/dev/console ;; ina_stop) echo "[$BNAME] inadyn stop" - /sbin/service inadyn stop >/dev/console + $y_path_sbin/service inadyn stop >/dev/console rm -f /var/etc/.inadyn ;; drop_start) echo "[$BNAME] dropbear start" touch /var/etc/.dropbear - /sbin/service dropbear start >/dev/console + $y_path_sbin/service dropbear start >/dev/console ;; drop_stop) echo "[$BNAME] dropbear stop" - /sbin/service dropbear stop >/dev/console + $y_path_sbin/service dropbear stop >/dev/console rm -f /var/etc/.dropbear ;; ush_start) echo "[$BNAME] ushare start" touch /var/etc/.ushare - /sbin/service ushare start >/dev/console + $y_path_sbin/service ushare start >/dev/console ;; ush_stop) echo "[$BNAME] ushare stop" - /sbin/service ushare stop >/dev/console + $y_path_sbin/service ushare stop >/dev/console rm -f /var/etc/.ushare ;; djm_start) echo "[$BNAME] djmount start" touch /var/etc/.djmount - /sbin/service djmount start >/dev/console + $y_path_sbin/service djmount start >/dev/console ;; djm_stop) echo "[$BNAME] djmount stop" - /sbin/service djmount stop >/dev/console + $y_path_sbin/service djmount stop >/dev/console rm -f /var/etc/.djmount ;; xud_start) echo "[$BNAME] xupnpd start" touch /var/etc/.xupnpd - /sbin/service xupnpd start >/dev/console + $y_path_sbin/service xupnpd start >/dev/console ;; xud_stop) echo "[$BNAME] xupnpd stop" - /sbin/service xupnpd stop >/dev/console + $y_path_sbin/service xupnpd stop >/dev/console rm -f /var/etc/.xupnpd ;; cro_start) echo "[$BNAME] crond start" touch /var/etc/.crond - /sbin/service crond start >/dev/console + $y_path_sbin/service crond start >/dev/console ;; cro_stop) echo "[$BNAME] crond stop" - /sbin/service crond stop >/dev/console + $y_path_sbin/service crond stop >/dev/console rm -f /var/etc/.crond ;; *) diff --git a/src/nhttpd/web/scripts/Y_NI_Tools.sh b/src/nhttpd/web/scripts/Y_NI_Tools.sh index d61892d9f..cde554ffb 100644 --- a/src/nhttpd/web/scripts/Y_NI_Tools.sh +++ b/src/nhttpd/web/scripts/Y_NI_Tools.sh @@ -107,7 +107,7 @@ is_mount() is_exec() { F=$1 - test -x /var/bin/$F + test -x $y_path_varbin/$F return $? } @@ -265,7 +265,7 @@ case "$action" in newcsreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh newcs_reset;; vinfo) - if ! [ -x /var/bin/$1 ]; then + if ! [ -x $y_path_varbin/$1 ]; then printf "%s" "n/a" exit fi @@ -273,7 +273,7 @@ case "$action" in if [ "$CAM" = "GBOX" ]; then CAM=GBOX.NET fi - V=$(/bin/vinfo $CAM /var/bin/$1) + V=$($y_path_bin/vinfo $CAM $y_path_varbin/$1) printf "%s" "${V//keine Informationen gefunden/}" ;;