From 8431655fc281e17ad7e3242049d2094f714a6957 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sat, 30 Mar 2024 09:31:18 -0700
Subject: [PATCH] updated updater script

---
 .../Update_Sovran_SystemsOS.sh                | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 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 8591f67..8a5c075 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -5,6 +5,7 @@ FLATPAK () {
 if ! ssh root@localhost 'flatpak update -y' ; then
 
 	zenity --error \
+	--width=550 \
 	--title="Sovran_SystemsOS_Updater" \
 	--text="Could Not Update Flatpaks."
 
@@ -14,13 +15,44 @@ fi
 
 }
 
+SPICE-FLAKE () {
+
+time_stamp=$(date +%Y-%m-%d-%T)
+
+mkdir -p /home/free/Documents/Updater_App_Logs
+
+ssh root@localhost "cd /etc/nixos && nix flake update 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt"
+
+}
+
+TACO-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" \
+	--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
+
+fi
+
+popd
+
+}
+
 SPICE () {
 
 time_stamp=$(date +%Y-%m-%d-%T)
 
 mkdir -p /home/free/Documents/Updater_App_Logs
 
-xterm -T "Sovran_SystemsOS_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 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}_Updater_Log.txt'"
+xterm -T "Sovran_SystemsOS_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'"
 
 }
 
@@ -30,12 +62,12 @@ pushd /home/free/Documents/Updater_App_Logs
 
 file=$(ls -Art | tail -n 1)
 
-if grep -w "error :" $file ; then
+if grep -w "error:" $file ; then
 	
 	zenity --error \
 	--width=1300 \
 	--title="Sovran_SystemsOS_Updater" \
-	--text="Could not complete the Sovran_SystemsOS update. Check the error log in your Documents under Updater_App_Logs folder for more details."	
+	--text="Could not complete the Sovran_SystemsOS Update. Check the Updater_Log.txt in your Documents under Updater_App_Logs folder for more details."	
 
 else
 	zenity --info \
@@ -53,7 +85,7 @@ popd
 
 }
 
-#########
+###########
 
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" |
 
@@ -69,6 +101,10 @@ if [[ $? -eq 1 ]]; then
 else
 
 	FLATPAK | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Updater"
+	
+	SPICE-FLAKE
+	
+	TACO-FLAKE
 
 	SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating 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"