From 13f679097ed7c1abd2490a7a961d00484eb8f447 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Tue, 12 Dec 2023 13:57:21 -0800
Subject: [PATCH] updated both updaters with new error notification

---
 .../Update_Sovran_SystemsOS_Light.sh          | 66 +++++++++++--------
 .../Update_Sovran_SystemsOS.sh                | 50 +++++++-------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/Sovran_SystemsOS_Light_Updater/Updater Source Files/Update_Sovran_SystemsOS_Light.sh b/Sovran_SystemsOS_Light_Updater/Updater Source Files/Update_Sovran_SystemsOS_Light.sh
index 9af82ae..660ce96 100755
--- a/Sovran_SystemsOS_Light_Updater/Updater Source Files/Update_Sovran_SystemsOS_Light.sh	
+++ b/Sovran_SystemsOS_Light_Updater/Updater Source Files/Update_Sovran_SystemsOS_Light.sh	
@@ -1,33 +1,50 @@
-!/usr/bin/env bash
+#!/usr/bin/env bash
 
-FLATPAK () {
-if ! ssh root@localhost 'flatpak update -y' ; then
+PASSWORD=$(zenity --password --title="Your User Password")
 
-zenity --error \
---title="Sovran_SystemsOS_Light Updater" \
---text="Could Not Update Flatpaks."
-
-exit 1
-
-fi
-
-}
-
-SPICE () {
-if ! xterm -T "Sovran_SystemsOS_Light Updater" -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
+HOME () {
+if ! echo $PASSWORD | sudo -S flatpak update -y ; then
 
 	zenity --error \
-	--width=400 \
 	--title="Sovran_SystemsOS_Light Updater" \
-	--text="Could not complete the update."
+	--text="Could Not Update Flatpaks."
 
 	exit 1
 
 fi
 
-}
+if ! echo $PASSWORD | cd /etc/nixos && sudo -S nix flake update ; then
 
-#########
+	zenity --error \
+	--width=400 \
+	--title="Sovran_SystemsOS_Light Updater" \
+	--text="Could not complete the Nix Flake update."
+
+	exit 1
+
+fi
+
+if ! echo $PASSWORD | sudo -S nixos-rebuild switch --impure ; then
+
+	zenity --error \
+	--width=400 \
+	--title="Sovran_SystemsOS_Light Updater" \
+	--text="Could not complete the NixOS update."
+
+	exit 1
+
+else
+
+	zenity --info \
+	--ellipsize \
+	--no-wrap \
+	--width=500 \
+	--title="Sovran_SystemsOS_Light Updater" \
+	--text="Yay complete! Please reboot when you are ready."
+
+fi
+
+}
 
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" |
 
@@ -42,16 +59,7 @@ exit 1
 
 else
 
-FLATPAK
-
-SPICE | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please be patient..." --title="Sovran_SystemsOS_Light Updater"
-
-zenity --info \
---ellipsize \
---no-wrap \
---width=500 \
---title="Sovran_SystemsOS_Light Updater" \
---text="Yay complete! Please reboot when you are ready."
+HOME | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please be patient..." --title="Sovran_SystemsOS_Light Updater"
 
 fi
 
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 622c479..f7ae86d 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -1,51 +1,43 @@
 #!/usr/bin/env bash
 
-PASSWORD=$(zenity --password --title="Main Password")
+FLATPAK () {
+if ! ssh root@localhost 'flatpak update -y' ; then
 
-HOME () {
-if ! echo $PASSWORD | sudo -S -u root flatpak update -y ; then
+zenity --error \
+--title="Sovran_SystemsOS_Light Updater" \
+--text="Could Not Update Flatpaks."
 
-	zenity --error \
-	--title="Sovran_SystemsOS_Light Updater" \
-	--text="Could Not Update Flatpaks."
-
-	exit 1
+exit 1
 
 fi
 
-if ! echo $PASSWORD | cd /etc/nixos && sudo -S -u root nix flake update ; then
+}
+
+SPICE () {
+if ! xterm -T "Sovran_SystemsOS_Light Updater" -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 --error \
 	--width=400 \
 	--title="Sovran_SystemsOS_Light Updater" \
-	--text="Could not complete the Nix Flake update."
-
-	exit 1
-
-fi
-
-if ! echo $PASSWORD | sudo -S -u root nixos-rebuild switch --impure ; then
-
-	zenity --error \
-	--width=400 \
-	--title="Sovran_SystemsOS_Light Updater" \
-	--text="Could not complete the NixOS update."
+	--text="Could not complete the update."
 
 	exit 1
 
 else
 
-	zenity --info \
-	--ellipsize \
-	--no-wrap \
-	--width=500 \
-	--title="Sovran_SystemsOS_Light Updater" \
-	--text="Yay complete! Please reboot when you are ready."
+zenity --info \
+--ellipsize \
+--no-wrap \
+--width=500 \
+--title="Sovran_SystemsOS_Light Updater" \
+--text="Yay complete! Please reboot when you are ready."
 
 fi
 
 }
 
+#########
+
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" |
 
 zenity --text-info \
@@ -59,7 +51,9 @@ exit 1
 
 else
 
-HOME | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please be patient..." --title="Sovran_SystemsOS_Light Updater"
+FLATPAK
+
+SPICE | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please be patient..." --title="Sovran_SystemsOS_Light Updater"
 
 fi