mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

ap51-flash: run through shellcheck 

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-07-10 15:30:03 -07:00
parent f94cb351bc
commit 700b4e5cc1
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/ap51-flash/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ap51-flash
PKG_VERSION:=2019.0.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ap51-flash/ap51-flash/releases/download/v$(PKG_VERSION)

24
utils/ap51-flash/files/ap51-flash.init
View File

@ -16,14 +16,15 @@ start_daemon() {
[ "$loop" != "1" ] && loop=0
if [ -n "$ifname" -a -n "$rootfs" -a -n "$kernel" ] || \
[ -n "$ifname" -a -n "$ubnt" ]; then
PID="`cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null`"
[ -z "`ps | grep "^.[ ]*$PID "`" ] && \
rm /var/run/$NAME.sh-$ifname.pid
[ -n "`ls /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ] && {
PID="$(cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null)"
if ! pgrep "^.[ ]*$PID "; then
rm "/var/run/$NAME.sh-$ifname.pid"
fi
if find /var/run/ -name "$NAME.sh-$ifname.pid"; then
echo "Can't start more than one ap51-flash for interface $ifname!"
return 0
}
start-stop-daemon -S -b -m -p /var/run/$NAME.sh-$ifname.pid -n $NAME.sh \
fi
start-stop-daemon -S -b -m -p "/var/run/$NAME.sh-$ifname.pid" -n $NAME.sh \
-x /usr/lib/ap51-flash/$NAME.sh -- "$loop" "$ifname" "$rootfs" "$kernel" "$ubnt"
fi
}
@ -38,13 +39,6 @@ stop() {
echo "WARNING: Going to teminate all ap51-flash processes! (hope you made sure that they're not flashing right now)"
echo "OR you can stop this with Ctrl+c within 10 seconds"
sleep 10
local pidfile
for pidfile in `ls /var/run/${NAME}.sh-*.pid 2> /dev/null`; do
start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}.sh" >/dev/null
rm -f "${pidfile}"
done
for pidfile in `ls /var/run/${NAME}-*.pid 2> /dev/null`; do
start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}" >/dev/null
rm -f "${pidfile}"
done
find /var/run/ -name "$NAME.sh-*.pid" -exec start-stop-daemon -K -s TERM -p '{}' -n "$NAME.sh" \; -exec rm -f '{}' \;
find /var/run/ -name "$NAME.sh-*.pid" -exec start-stop-daemon -K -s TERM -p '{}' -n "$NAME" \; -exec rm -f '{}' \;
}

12
utils/ap51-flash/files/ap51-flash.sh
View File

@ -5,17 +5,17 @@ rootfs=""
kernel=""
ubnt=""
[ $1 -eq "1" ] && loop="1"
[ "$1" -eq "1" ] && loop="1"
ifname="$2"
[ -n "$3" ] && rootfs="--rootfs $3"
[ -n "$4" ] && kernel="--kernel $4"
[ -n "$5" ] && ubnt="--ubnt $5"
while [ 1 ]; do
start-stop-daemon -S -m -p /var/run/$NAME-$ifname.pid -n $NAME \
-x /usr/sbin/$NAME -- --flash-from-file $rootfs $kernel $ubnt $ifname
rm /var/run/$NAME-$ifname.pid
while true; do
start-stop-daemon -S -m -p "/var/run/$NAME-$ifname.pid" -n $NAME \
-x /usr/sbin/$NAME -- --flash-from-file "$rootfs" "$kernel" "$ubnt" "$ifname"
rm "/var/run/$NAME-$ifname.pid"
[ "$loop" != "1" ] && break
sleep 15
done