From d3c7f986174e1669eeb7162d508c3cff3f24255f Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Tue, 5 Dec 2023 08:31:04 -0800
Subject: [PATCH] updated updater fix

---
 .../Update_Sovran_SystemsOS.sh                | 91 +++----------------
 1 file changed, 15 insertions(+), 76 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 a9779d0..4a8746a 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -1,93 +1,32 @@
 #!/usr/bin/env bash
 
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" |
-
+		
 zenity --text-info \
-	--width=1000 \
-	--height=700 \
-	--title="Sovran_SystemsOS Updater" 
+		--width=1000 \
+		--height=700 \
+		--title="Sovran_SystemsOS Updater"
+
 
 if [[ $? -eq 1 ]]; then
-	
-	exit 1
+		
+		exit 1
 
 else
-
-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 \
-		--width=500 \
-		--title="Sovran_SystemsOS Updater" \
-
-	 
-		exit 1
-
-	fi	
-
-ssh root@localhost 'cd /etc/nixos; nix flake update' |
-
-	zenity --progress \
-		--no-cancel \
-		--auto-close \
-		--pulsate \
-		--width=500 \
-		--text="Moving Files Into Place..." \
-		--title="Sovran_SystemsOS Updater"
-
-	if [[ $? -ne 0 ]]; then
+	if ! ssh root@localhost 'flatpak update -y' ; then
+		zenity --error
+	exit 1
 	
-		echo "Could Not Update Flake -- Exiting" |
-	
-		zenity --text-info \
-			--title="Sovran_SystemsOS Updater" \
-			--width=500 \
- 
-		exit 1
-
 	fi
-
-ssh root@localhost 'nixos-rebuild switch --impure' |
-		
-	zenity --progress \
-		--no-cancel \
-		--auto-close \
-		--pulsate \
-		--width=500 \
-		--text="Updating, In Rare Cases, It Could Take Up To 3 Hours, Please Be Patient..." \
-		--title="Sovran_SystemsOS Updater"
-
-	if [[ $? -ne 0 ]]; then
 	
-		echo "Could Not Update Sovran_SystemsOS -- Exiting" |
 		
-		zenity --text-info \
-			--width=500 \
-			--title="Sovran_SystemsOS Updater"
-			
- 
-		exit 1
-
+	if ! ssh root@localhost 'cd /etc/nixos ; nix flake update ; nixos-rebuild switch --impure' ; then
+		zenity --error
+	exit 1
+	
 	fi
-
-zenity --info \
-	--ellipsize \
-	--no-wrap \
-	--width=500 \
-	--title="Sovran_SystemsOS Updater" \
-	--text="Yay Complete! Please Reboot When You Are Ready."
-
+	
 fi
 
 exit 0
\ No newline at end of file