From da2ad008d9f30060d161a4c4fdb36d3d2c6c3e1d Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Wed, 24 Aug 2022 19:13:51 -0400 Subject: [PATCH] employ shell script goodies to caress the code https://github.com/mvdan/sh https://github.com/koalaman/shellcheck https://explainshell.com/ --- general/overlay/usr/sbin/sysupgrade | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 3337a64f..8d16682d 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -96,18 +96,17 @@ free_resources() { # "load_$vendor" -r >/dev/null 2>&1 || true # echo_c 37 "\nStop services, sync and fresh memory" - for proc in majestic crond klogd ntpd rngd syslogd - do + for proc in majestic crond klogd ntpd rngd syslogd; do echo -n "Killing $proc " - while [ -n "$(pidof $proc)" ] - do + while [ -n "$(pidof $proc)" ]; do killall $proc >/dev/null 2>&1 || true sleep 0.1 echo -n "." done echo ". OK" done - sync; echo 3 >/proc/sys/vm/drop_caches + sync + echo 3 >/proc/sys/vm/drop_caches } self_update() { @@ -281,11 +280,11 @@ done print_sysinfo -[ "$update_kernel" -eq 0 ] && \ -[ "$update_rootfs" -eq 0 ] && \ -[ "$clear_overlay" -eq 0 ] && \ -echo_c 37 "\nTry '$(basename "$0") --help' for options." && \ -exit 0 +[ "$update_kernel" -eq 0 ] && + [ "$update_rootfs" -eq 0 ] && + [ "$clear_overlay" -eq 0 ] && + echo_c 37 "\nTry '$(basename "$0") --help' for options." && + exit 0 self_update