Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-02-01 15:20:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: Fix func execAndRead

Browse Source
This commit is contained in:
remittor
2026-01-31 23:09:12 +03:00
parent 1f784b5773
commit b0fc623183
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zapret2/script-exec.sh
View File

@@ -1,13 +1,18 @@
#!/bin/sh
# Copyright (c) 2024 remittor
awk -V
PID_FILE=/tmp/zapret-script-exec.pid
[ -f $PID_FILE ] && exit 70
if [ -f $PID_FILE ]; then
echo "ERROR: file $PID_FILE already exists!" | awk 'NR==1'
exit 70
fi
LOG_FILE=$1
RC_FILE=$1.rc
SH_FILE=$2
shift 2
[ ! -f $SH_FILE ] && exit 71
if [ ! -f $SH_FILE ]; then
echo "ERROR: script $SH_FILE not found!" | awk 'NR==1'
exit 71
fi
: > $LOG_FILE
: > $RC_FILE
start-stop-daemon -S -b -p $PID_FILE -x /bin/sh -- -c '
@@ -17,7 +22,13 @@ start-stop-daemon -S -b -p $PID_FILE -x /bin/sh -- -c '
shift 3
sh $SH_FILE "$@" > $LOG_FILE 2>&1
RET_CODE=$?
sleep 1
wc -l $LOG_FILE >/dev/null
echo $RET_CODE > $RC_FILE
' sh $LOG_FILE $RC_FILE $SH_FILE "$@"
RET_CODE=$?
if [ $RET_CODE != 0 ]; then
echo "ERROR: script $SH_FILE not executed! ret_code = $RET_CODE" | awk 'NR==1'
exit $RET_CODE
fi
echo "Script $SH_FILE running..." | awk 'NR==1'
exit 0