From a1626f8eec1c7e9b8f2c7018337ae5f18572ac52 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sun, 3 Dec 2023 23:49:39 -0800
Subject: [PATCH] updated updater fix

---
 .../Update_Sovran_SystemsOS.sh                | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh
index 3464ef5..84fc352 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -16,48 +16,44 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr
 	else
 
 	
-	ssh root@localhost 'flatpak update -y' |
+		if ! ssh root@localhost 'flatpak update -y' |
 
-		zenity --progress \
-			--no-cancel \
-			--auto-close \
-			--pulsate \
-			--width=500 \
-			--text="Updating Flatpaks" \
-			--title="Sovran_SystemsOS Updater"
-		
-		if [[ $? -ne 0 ]]; then
-			
-			echo "Could Not Update Flatpaks -- Exiting" |
-			
-			zenity --text-info \
-				--title="Sovran_SystemsOS Updater" \
+			zenity --progress \
+				--no-cancel \
+				--auto-close \
+				--pulsate \
 				--width=500 \
-		 
+				--text="Updating Flatpaks" \
+				--title="Sovran_SystemsOS Updater"; then
+				
+				echo "Could Not Update Flatpaks -- Exiting" |
+				
+					zenity --text-info \
+						--title="Sovran_SystemsOS Updater" \
+						--width=500 \
+			 
 			exit 1
-  
+	  
 		fi	
 
-	xterm -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'cd /etc/nixos && nix flake update && nixos-rebuild switch --impure'"
-
-		if [[ $? -ne 0 ]]; then
-		
-			echo "Could Not Update Sovran_SystemsOS -- Exiting" |
+		if ! xterm -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'cd /etc/nixos && nix flake update && nixos-rebuild switch --impure'"; then
 			
-			zenity --text-info \
-				--title="Sovran_SystemsOS Updater" \
-				--width=500 \
-	 
+			echo "Could Not Update Sovran_SystemsOS -- Exiting" |
+				
+				zenity --text-info \
+					--title="Sovran_SystemsOS Updater" \
+					--width=500 \
+		 
 			exit 1
 
 		fi
 
-zenity --info \
-		--ellipsize \
-		--no-wrap \
-		--width=500 \
-		--title="Sovran_SystemsOS Updater" \
-		--text="Yay Complete! Please Reboot When You Are Ready."
+		zenity --info \
+			--ellipsize \
+			--no-wrap \
+			--width=400 \
+			--title="Sovran_SystemsOS Updater" \
+			--text="Yay Complete! Please Reboot When You Are Ready."
 	fi
 
 exit 0
\ No newline at end of file