From 01f9a8ef8d5585dfcdc0bce1293f8f955c75549f Mon Sep 17 00:00:00 2001
From: Alfonso Gamboa <gtxent@gmail.com>
Date: Sat, 28 May 2022 06:02:44 -0700
Subject: [PATCH] rework upgrade system

---
 SD_ROOT/wz_mini/etc/init.d/v3_init.sh  | 7 -------
 SD_ROOT/wz_mini/etc/init.d/v3_post.sh  | 1 +
 SD_ROOT/wz_mini/etc/init.d/wz_user.sh  | 6 ++++++
 SD_ROOT/wz_mini/usr/bin/upgrade-run.sh | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh
index 3b235c7..ee929e9 100755
--- a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh
+++ b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh
@@ -165,11 +165,4 @@ elif [[ -d /opt/Upgrade ]]; then
 	touch /tmp/dbgflag
 fi
 
-if ! [[ -e /tmp/dbgflag ]]; then
-		/opt/wz_mini/etc/init.d/wz_user.sh &
-else
-	echo "debug enabled, ignore wz_user.sh"
-fi
-
-
 /linuxrc
diff --git a/SD_ROOT/wz_mini/etc/init.d/v3_post.sh b/SD_ROOT/wz_mini/etc/init.d/v3_post.sh
index b929251..bb85e90 100755
--- a/SD_ROOT/wz_mini/etc/init.d/v3_post.sh
+++ b/SD_ROOT/wz_mini/etc/init.d/v3_post.sh
@@ -60,6 +60,7 @@ if [[ "$RTSP_HI_RES_ENABLED" == "true" ]] ||  [[ "$RTSP_LOW_RES_ENABLED" == "tru
 
         cp /system/bin/iCamera /opt/wz_mini/tmp/.storage/
         mount -o ro,bind /opt/wz_mini/usr/bin/iCamera /system/bin/iCamera
+	/opt/wz_mini/etc/init.d/wz_user.sh &
 fi
 
 ##LIBRARY DEBUG
diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh
index 3a3bcb9..53cb06d 100755
--- a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh
+++ b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh
@@ -7,6 +7,12 @@ set -x
 echo "welcome to wz_user.sh"
 echo "PID $$"
 
+
+if [[ -e /tmp/dbgflag ]];then
+        echo "debug mode, disabled"
+        exit 0
+fi
+
 export WZMINI_CFG=/opt/wz_mini/wz_mini.conf
 
 [ -f $WZMINI_CFG ] && source $WZMINI_CFG
diff --git a/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh b/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh
index b79ba3d..a11e136 100755
--- a/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh
+++ b/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh
@@ -33,7 +33,6 @@ reboot
 if [[ -e /tmp/dbgflag ]]; then
 upgrade_mode_start
 else
-
 read -r -p "${1:-wz_mini, this will download the latest version and upgrade your system.  Are you sure? [y/N]} " response
     case "$response" in
         [yY][eE][sS]|[yY])