From 622c183ffdde92d551239050aa3c9c995363fa36 Mon Sep 17 00:00:00 2001 From: cronyx Date: Wed, 27 Jul 2022 14:34:00 +0300 Subject: [PATCH 1/2] sysupgrade: dirty fix, do not check new version if -n option is used --- general/overlay/usr/sbin/sysupgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 499a18c5..eda0cac1 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -3,9 +3,9 @@ # OpenIPC.org | v.20220727 # -scr_version=1.0.0 +scr_version=1.0.1 -args="$@" +args=" $@" set -e @@ -111,8 +111,8 @@ free_resources() { } self_update() { - if echo ${args} | grep "rootfs" || echo ${args} | grep "kernel" > /dev/null 2>&1; then - echo -e "\nOffline upgrade, skip sysupgrade version check." + if echo ${args} | grep "rootfs" || echo ${args} | grep "kernel" || echo "${args}" | grep -- "-n" > /dev/null 2>&1; then + echo -e "\nOffline upgrade or Overlay clean, skip sysupgrade version check." else echo -e "\nOnline upgrade, checking sysupgrade version..." curl -s -k -L -o /tmp/sysupgrade "https://raw.githubusercontent.com/OpenIPC/firmware/master/general/overlay/usr/sbin/sysupgrade" From beb8f39f8efe4971e00373eab97f183205624c02 Mon Sep 17 00:00:00 2001 From: cronyx Date: Wed, 27 Jul 2022 14:45:29 +0300 Subject: [PATCH 2/2] sysupgrade: added missing quotes --- general/overlay/usr/sbin/sysupgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index eda0cac1..ae0e7551 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -111,7 +111,7 @@ free_resources() { } self_update() { - if echo ${args} | grep "rootfs" || echo ${args} | grep "kernel" || echo "${args}" | grep -- "-n" > /dev/null 2>&1; then + if echo "${args}" | grep "rootfs" || echo "${args}" | grep "kernel" || echo "${args}" | grep -- "-n" > /dev/null 2>&1; then echo -e "\nOffline upgrade or Overlay clean, skip sysupgrade version check." else echo -e "\nOnline upgrade, checking sysupgrade version..."