chore: simplify and fix indents for postremove (evcc-io#12849)

jangocheng · Mar 10, 2024 · 4121c14 · 4121c14
1 parent 266e514
commit 4121c14
Showing 1 changed file with 28 additions and 41 deletions.
diff --git a/packaging/scripts/postremove.sh b/packaging/scripts/postremove.sh
@@ -18,51 +18,38 @@ if [ "$1" = "purge" ]; then
 	fi
 fi
 
-
-
-
-# if interactive: Call /usr/bin/evcc checkconfig and check the return code (newer version)
+# if interactive: call `/usr/bin/evcc checkconfig` and check the return code (newer version)
 # if return code is 0, do nothing
 # else: Ask user if he wants to keep the old version (working) or the new version (not working) 
 # Remember the choice with /tmp/.evccrollback and fail new-postrm failed-upgrade old-version new-version to initiate dpkg's rollback
-if [ "$1" = "upgrade" ]; then
-	INTERACTIVE=0
-	# is shell script interactive?
-	if [ -t 0 ]; then
-	  INTERACTIVE=1
-	else
-	  INTERACTIVE=0
+if [ "$1" = "upgrade" ] && [ -t 0 ]; then
+	if ! /usr/bin/evcc checkconfig > /dev/null; then
+		echo "--------------------------------------------------------------------------------"
+		echo "ERROR: your configuration is not compatible with the new version:"
+		/usr/bin/evcc checkconfig --log error || true
+		echo "Please consult the release notes: https://github.com/evcc-io/evcc/releases"
+		echo "--------------------------------------------------------------------------------"
+
+		while true; do
+			echo "Do you want to keep your old (working) version? [Y/n]: "
+			read choice
+			case "$choice" in
+				n*|N*|"")
+					echo "We will keep the new version. Your configuration stays untouched!"
+					break
+					;;
+				y*|Y*)
+					echo "The old version will be restored. Your configuration stays untouched! Following errors are intended:"
+					touch /tmp/.evccrollback
+					exit 1
+					break
+					;;
+				*)
+					;;
+			esac
+		done
 	fi
-
-	if [ $INTERACTIVE -eq 1 ]; then
-      if ! /usr/bin/evcc checkconfig > /dev/null; then
-			echo "--------------------------------------------------------------------------------"
-			echo "ERROR: your evcc configuration is not compatible with the new version. Please consider reading the release notes: https://github.com/evcc-io/evcc/releases"
-			echo "checkconfig Output:" 
-			/usr/bin/evcc checkconfig || true
-			echo "--------------------------------------------------------------------------------"
-
-			while true; do
-				echo "Do you want to keep your old (working) evcc version? [Y/n]: "
-				read choice
-				case "$choice" in
-					n*|N*|"")
-						echo "We will keep the new version. Your evcc configuration stays untouched!"
-						break
-						;;
-					y*|Y*)
-						echo "The old version will be restored. Your evcc configuration stays untouched! Following errors are intended:"
-						touch /tmp/.evccrollback
-						exit 1
-						break
-						;;
-					*)
-						;;
-				esac
-			done
-		fi
-	fi 
-fi
+fi 
 
 # if upgrade goal fails, new-postrm failed-upgrade old-version new-version is called. It should fail to initiate rollback
 if [ "$1" = "failed-upgrade" ]; then