From c0284ecafa74ab4626e90baca1dc799d89360d81 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sat, 9 Dec 2023 10:50:27 -0800
Subject: [PATCH] made updater notificaitons more reliable

---
 .../Update_Sovran_SystemsOS.sh                | 72 ++++++++++---------
 1 file changed, 40 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 778f333..eadb3ff 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -1,54 +1,62 @@
-#!/usr/bin/env bash
+!/usr/bin/env bash
 
 FLATPAK () {
-if ! ssh root@localhost 'flatpak update -y' ; then		
-	zenity --error \
-	--title="Sovran_SystemsOS Updater" \
-	--text="Could Not Update Flatpaks."
-	
-	exit 1
+if ! ssh root@localhost 'flatpak update -y' ; then
+
+zenity --error \
+--title="Sovran_SystemsOS Updater" \
+--text="Could Not Update Flatpaks."
+
+exit 1
 
 fi
 
 }
 
 SPICE () {
-xterm -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "
+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 [[ $? != 0 ]] ; then
+
+zenity --info \
+--ellipsize \
+--no-wrap \
+--width=700 \
+--title="Sovran_SystemsOS Updater" \
+--text="Yay, your Sovran Pro update is complete! Please reboot when you are ready."
+
+exit 1
+
+else
+
+zenity --error \
+--title="Sovran_SystemsOS Updater" \
+--text="Could Not Update Sovran_SystemsOS."
+
+exit 2
 
-if ! ssh root@localhost 'cd /etc/nixos && nix flake update && nixos-rebuild switch --impure' ; then 
-	
-	zenity --error
-	
-	exit 1
-	
 fi
 
-"
 }
 
-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"
+#########
+
+curl "[https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater Source Files/Intro.md](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
 
-		exit 1
+exit 1
 
-else	
+else
 
-	FLATPAK 
+FLATPAK
 
-	SPICE | zenity --progress --no-cancel --auto-close --width=550 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please Be Patient..." --title="Sovran_SystemsOS Updater" 
-	
-	zenity --info \
-	--ellipsize \
-	--no-wrap \
-	--width=700 \
-	--title="Sovran_SystemsOS Updater" \
-	--text="Yay, your Sovran Pro update is complete! Please reboot when you are ready."
+SPICE | zenity --progress --no-cancel --auto-close --width=550 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please Be Patient..." --title="Sovran_SystemsOS Updater"
 
 fi