From 9cc1ae05742ce31c99360e91e2cab05554ded049 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sun, 31 Mar 2024 11:17:33 -0700
Subject: [PATCH] updated both updater apps

---
 .../Update_Sovran_SystemsOS_Light.sh          | 37 +++++++++-------
 .../Update_Sovran_SystemsOS.sh                | 43 +++++++++++++------
 2 files changed, 50 insertions(+), 30 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 8193b7b..c9f202f 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	
@@ -22,10 +22,11 @@ if grep -w "Permission denied" $file ; then
 	--width=500 \
 	--title="Sovran_SystemsOS_Light_Updater" \
 	--text="Authentication Canceled. Exiting..."
-exit 1
+	
+	exit 1
 
 fi
-	
+
 popd
 	
 }
@@ -38,7 +39,6 @@ ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Up
 
 }
 
-
 PANCAKE-FLAKE () {
 
 pushd /home/free/Documents/Updater_App_Logs
@@ -52,16 +52,15 @@ if grep -w "nix: error" $file ; then
 	--title="Sovran_SystemsOS_Light_Updater" \
 	--text="Could not complete the Flake update. Check the Updater_Flake_Log.txt in your Documents under Updater_App_Logs folder for more details."	
  
- exit 1
+	exit 1
 
 fi
-
+ 
 popd
-
+ 
 }
-
-
-SPICE () {
+ 
+YOGURT-FLAKE () {
 
 pushd /home/free/Documents/Updater_App_Logs
 
@@ -75,17 +74,21 @@ if ! grep -w "updating" $file ; then
 	--width=600 \
 	--title="Sovran_SystemsOS_Light_Updater" \
 	--text="There are no updates at this time. Your Sovran Book Pro is up to date!"	
- 
- exit 1
+	
+	exit 1
 
-else
+fi
+
+popd
+
+}
+ 
+SPICE () {
 
 time_stamp=$(date +%Y-%m-%d-%T)
 
 xterm -T "Sovran_SystemsOS_Light_Updater" -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'cd /etc/nixos && nixos-rebuild switch --impure 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Log.txt'"
 
-fi
-
 }
 
 TACO () {
@@ -109,7 +112,7 @@ else
 	--title="Sovran_SystemsOS_Light_Updater" \
 	--text="Yay complete! Please reboot when you are ready."
 	
- exit 1
+	exit 1
 
 fi
 
@@ -139,7 +142,9 @@ else
 	FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Light_Updater"
 	
 	PANCAKE-FLAKE
-
+	
+	YOGURT-FLAKE
+	
 	SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system now. In rare cases, it could take up to 1 hour. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Light_Updater"
 	
 	TACO
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 832cf80..18adc1d 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -21,11 +21,12 @@ if grep -w "Permission denied" $file ; then
 	zenity --error \
 	--width=500 \
 	--title="Sovran_SystemsOS_Updater" \
-	--text="Authentication canceled. Exiting..."
-exit 1
+	--text="Authentication Canceled. Exiting..."
+	
+	exit 1
 
 fi
-	
+
 popd
 	
 }
@@ -34,8 +35,18 @@ FLAKE () {
 
 time_stamp=$(date +%Y-%m-%d-%T)
 
-if ! ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt" ; then
+ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt"
 
+}
+
+PANCAKE-FLAKE () {
+
+pushd /home/free/Documents/Updater_App_Logs
+
+file=$(ls -Art | tail -n 1)
+
+if grep -w "nix: error" $file ; then
+	
 	zenity --error \
 	--width=1300 \
 	--title="Sovran_SystemsOS_Updater" \
@@ -44,10 +55,12 @@ if ! ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documen
 	exit 1
 
 fi
-
+ 
+popd
+ 
 }
-
-PANCAKE-FLAKE () {
+ 
+YOGURT-FLAKE () {
 
 pushd /home/free/Documents/Updater_App_Logs
 
@@ -61,15 +74,15 @@ if ! grep -w "updating" $file ; then
 	--width=600 \
 	--title="Sovran_SystemsOS_Updater" \
 	--text="There are no updates at this time. Your Sovran Pro is up to date!"	
- 
- exit 0
+	
+	exit 1
 
 fi
 
 popd
 
 }
-
+ 
 SPICE () {
 
 time_stamp=$(date +%Y-%m-%d-%T)
@@ -99,7 +112,7 @@ else
 	--title="Sovran_SystemsOS_Updater" \
 	--text="Yay complete! Please reboot when you are ready."
 	
- exit 1
+	exit 1
 
 fi
 
@@ -113,7 +126,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr
 
 	zenity --text-info \
 	--width=1100 \
-	--height=730 \
+	--height=830 \
 	--title="Sovran_SystemsOS_Updater"
 
 if [[ $? -eq 1 ]]; then
@@ -129,8 +142,10 @@ else
 	FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Updater"
 	
 	PANCAKE-FLAKE
-
-	SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system now. In rare cases, it could take up to 3 hours. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Updater"
+	
+	YOGURT-FLAKE
+	
+	SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system now. In rare cases, it could take up to 1 hour. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Updater"
 	
 	TACO