From 5a2e3329ae92f48fe0ca63be171f536b22e3ebc1 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Thu, 7 Mar 2024 19:16:35 +0100 Subject: [PATCH] Overlay: update sysupgrade (#1338) --- general/overlay/usr/sbin/sysupgrade | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 69f9bad0..651cee47 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -3,7 +3,7 @@ # OpenIPC.org | 2024 # -scr_version=1.0.38 +scr_version=1.0.39 args=" $@" @@ -101,7 +101,7 @@ download_firmware() { free_resources() { echo_c 37 "\nStop services, sync files, free up memory" - if [ "$vendor" = "sigmastar" ]; then + if [ "$vendor" = "sigmastar" ] || [ "$vendor" = "ingenic" ]; then killall -q -3 majestic sleep 1 else @@ -133,9 +133,9 @@ kill_process() { set_progress() { if [ "1" = "$silent_update" ]; then - busybox $@ | awk '{print NR, $1}' + busybox "$@" | awk '{print NR, $1}' else - busybox $@ + busybox "$@" fi } @@ -233,7 +233,6 @@ Usage: $0 [options] Where: -k Update kernel from online repository. -r Update rootfs from online repository. - -w Update Web UI to development version. -d Update firmware from development branch. --url=[URL] Custom URL to update from (.tgz format). --kernel=[FILE] Update kernel from file (uImage format). @@ -338,11 +337,6 @@ for i in "$@"; do shift ;; - -w) - update_webui=1 - shift - ;; - -x | --no_reboot) skip_reboot=1 shift @@ -367,21 +361,11 @@ print_sysinfo [ "1" != "$clear_overlay" ] && [ "1" != "$update_kernel" ] && [ "1" != "$update_rootfs" ] && -[ "1" != "$update_webui" ] && echo_c 37 "\nTry '$(basename "$0") --help' for options." && exit 0 [ "1" != "$skip_selfupdate" ] && self_update -if [ "1" = "$update_webui" ]; then - if [ "1" = "$update_rootfs" ]; then - update_webui=0 - echo_c 31 "\nCannot update Web UI along with RootFS!" - echo_c 37 "Please update RootFS then reboot the camera and re-run $0 -w to update Web UI in a separate run." - sleep 5 - fi -fi - create_lock free_resources @@ -390,7 +374,6 @@ free_resources [ "1" = "$update_kernel" ] && do_update_kernel "$kernel_file" [ "1" = "$update_rootfs" ] && do_update_rootfs "$rootfs_file" [ "1" = "$clear_overlay" ] && do_wipe_overlay -[ "1" = "$update_webui" ] && updatewebui.sh -b dev reboot_system