From bd3a3eb7050e59043ff428b398d9c39400293660 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Mon, 4 Dec 2023 19:24:29 -0800
Subject: [PATCH] updated updater fix

---
 .../Update_Sovran_SystemsOS.sh                | 96 +++++++++++++++----
 1 file changed, 80 insertions(+), 16 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 776adc9..a9779d0 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -1,29 +1,93 @@
 #!/usr/bin/env bash
 
-set -o nounset
-		
 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"
 
-	if [[ $? -eq 1 ]]; then
+zenity --text-info \
+	--width=1000 \
+	--height=700 \
+	--title="Sovran_SystemsOS Updater" 
+
+if [[ $? -eq 1 ]]; then
+	
+	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
 
-	else
+	fi	
 
-	xterm -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'flatpak update -y && cd /etc/nixos && nix flake update && nixos-rebuild switch --impure'"
+ssh root@localhost 'cd /etc/nixos; nix flake update' |
 
-	zenity --info \
-		--ellipsize \
-		--no-wrap \
-		--width=400 \
-		--title="Sovran_SystemsOS Updater" \
-		--text="Yay Complete! Please Reboot When You Are Ready."
+	zenity --progress \
+		--no-cancel \
+		--auto-close \
+		--pulsate \
+		--width=500 \
+		--text="Moving Files Into Place..." \
+		--title="Sovran_SystemsOS Updater"
+
+	if [[ $? -ne 0 ]]; then
 	
+		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
+
+	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