mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: intensive use of variables

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

Origin message was:
------------------
- yWeb: intensive use of variables

------------------
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 4e070ec2cc
commit 2da45995c7
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/web/Makefile.am
View File

@@ -109,4 +109,3 @@ install-data-hook:
-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \ -e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \ -e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
; ;

4
src/nhttpd/web/scripts/Y_Live.sh
View File

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

20
src/nhttpd/web/scripts/Y_Tools.sh
View File

@@ -459,7 +459,7 @@ proc()
# ----------------------------------------------------------- # -----------------------------------------------------------
wol() wol()
{ {
if [ -e /bin/ether-wake ]; then if [ -e $y_path_bin/ether-wake ]; then
msg=`ether-wake $1` msg=`ether-wake $1`
fi fi
msg="<b>Wake on LAN $1</b><br><br>$msg" msg="<b>Wake on LAN $1</b><br><br>$msg"
@@ -471,10 +471,10 @@ wol()
# ----------------------------------------------------------- # -----------------------------------------------------------
do_lcshot() do_lcshot()
{ {
if [ -e "/var/bin/lcshot" ]; then if [ -e "$y_path_usrbin/lcshot" ]; then
/var/bin/lcshot $* $y_path_usrbin/lcshot $*
else else
/bin/lcshot $* $y_path_bin/lcshot $*
fi fi
} }
# ----------------------------------------------------------- # -----------------------------------------------------------
@@ -485,15 +485,15 @@ do_fbshot()
{ {
if [ "$1" = "fb" ]; then if [ "$1" = "fb" ]; then
shift 1 shift 1
if [ -e "/var/bin/fbshot" ]; then if [ -e "$y_path_usrbin/fbshot" ]; then
/var/bin/fbshot $* $y_path_usrbin/fbshot $*
else else
fbshot $* fbshot $*
fi fi
else else
shift 1 shift 1
if [ -e "/var/bin/dboxshot" ]; then if [ -e "$y_path_usrbin/dboxshot" ]; then
/var/bin/dboxshot $* $y_path_usrbin/dboxshot $*
else else
dboxshot $* dboxshot $*
fi fi
@@ -525,7 +525,7 @@ do_settings_backup_restore()
backup) backup)
rm -rf $workdir rm -rf $workdir
mkdir -p $workdir mkdir -p $workdir
/bin/backup.sh $workdir >/dev/null $y_path_bin/backup.sh $workdir >/dev/null
filename=$(ls -1 -tr $workdir/settings_* | tail -1) filename=$(ls -1 -tr $workdir/settings_* | tail -1)
echo "$filename" echo "$filename"
;; ;;
@@ -533,7 +533,7 @@ do_settings_backup_restore()
restore) restore)
if [ -s "$y_upload_file" ] if [ -s "$y_upload_file" ]
then then
msg=$(/bin/restore.sh "$y_upload_file") msg=$($y_path_bin/restore.sh "$y_upload_file")
else else
msg="error: no upload file" msg="error: no upload file"
fi fi

2
src/nhttpd/web/scripts/_Y_Globals.sh
View File

@@ -16,7 +16,9 @@ boxtype="coolstream"
#y_path_httpd="%(PRIVATE_HTTPDDIR)" #y_path_httpd="%(PRIVATE_HTTPDDIR)"
y_path_httpd=".." y_path_httpd=".."
y_path_scripts="$y_path_httpd/scripts" y_path_scripts="$y_path_httpd/scripts"
y_path_bin="/bin"
y_path_usrbin="/var/bin" y_path_usrbin="/var/bin"
y_path_sbin="/sbin"
y_path_config="%(CONFIGDIR)" y_path_config="%(CONFIGDIR)"
y_path_tmp="/tmp" y_path_tmp="/tmp"
y_path_zapit="$y_path_config/zapit" y_path_zapit="$y_path_config/zapit"

5
src/nhttpd/web/scripts/api.sh
View File

@@ -8,8 +8,10 @@
API_VERSION_MAJOR="1" API_VERSION_MAJOR="1"
API_VERSION_MINOR="0" API_VERSION_MINOR="0"
API_VERSION_TEXT="$API_VERSION_MAJOR.$API_VERSION_MINOR" API_VERSION_TEXT="$API_VERSION_MAJOR.$API_VERSION_MINOR"
#path_httpd="%(PRIVATE_HTTPDDIR)"
path_httpd=".." path_httpd=".."
path_scripts="$path_httpd/scripts" path_scripts="$path_httpd/scripts"
path_bin="/bin"
path_usrbin="/var/bin" path_usrbin="/var/bin"
path_sbin="/sbin" path_sbin="/sbin"
path_config="%(CONFIGDIR)" path_config="%(CONFIGDIR)"
@@ -85,6 +87,3 @@ case "$1" in
*) *)
echo "[api.sh] Parameter wrong: $*" ;; echo "[api.sh] Parameter wrong: $*" ;;
esac esac