From 4e68abcfc61235f8ae69c8fc491d9c274b8000c6 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sat, 30 Mar 2024 14:20:20 -0700
Subject: [PATCH] updated both updaters

---
 .../Update_Sovran_SystemsOS_Light.sh          | 74 +++++++++----------
 .../Update_Sovran_SystemsOS.sh                | 74 +++++++++----------
 2 files changed, 70 insertions(+), 78 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 f79f467..6bbf070 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,51 +1,50 @@
 #!/usr/bin/env bash
 
-FLATPAK () {
-
-if ! ssh root@localhost 'flatpak update -y' ; then
-
-	zenity --error \
-	--width=550 \
-	--title="Sovran_SystemsOS_Light_Updater" \
-	--text="Could Not Update Flatpaks."
-
-	exit 1
-
-fi
-
-}
-
-
-SPICE-FLAKE () {
-
-time_stamp=$(date +%Y-%m-%d-%T)
+LOGIN () {
 
 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"
+time_stamp=$(date +%Y-%m-%d-%T)
+
+ssh root@localhost flatpak update -y &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Login_Log.txt
 
 }
 
-
-TACO-FLAKE () {
+HUNGRY () {
 
 pushd /home/free/Documents/Updater_App_Logs
 
 file=$(ls -Art | tail -n 1)
 
-if grep -w "nix: error" $file ; then
+if grep -w "Permission denied" $file ; then
 	
+	zenity --error \
+	--width=500 \
+	--title="Sovran_SystemsOS_Light_Updater" \
+	--text="Authentication canceled. Exiting..."
+exit 1
+
+fi
+	
+popd
+	
+}
+
+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
+
 	zenity --error \
 	--width=1300 \
 	--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
-
 }
 
 PANCAKE-FLAKE () {
@@ -63,7 +62,7 @@ if ! grep -w "updating" $file ; then
 	--title="Sovran_SystemsOS_Light_Updater" \
 	--text="There are no updates at this time. Your Sovran Book Pro is up to date!"	
  
- exit 1
+ exit 0
 
 fi
 
@@ -71,13 +70,10 @@ popd
 
 }
 
-
 SPICE () {
 
 time_stamp=$(date +%Y-%m-%d-%T)
 
-mkdir -p /home/free/Documents/Updater_App_Logs
-
 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'"
 
 }
@@ -115,23 +111,23 @@ popd
 
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" |
 
-zenity --text-info \
---width=1100 \
---height=830 \
---title="Sovran_SystemsOS_Light_Updater"
+	zenity --text-info \
+	--width=1100 \
+	--height=830 \
+	--title="Sovran_SystemsOS_Light_Updater"
 
 if [[ $? -eq 1 ]]; then
 
 	exit 1
 
 else
-
-	FLATPAK | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Light_Updater"
 	
-	SPICE-FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Light_Updater"
+	LOGIN | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Light_Updater" 
+	
+	HUNGRY
+	
+	FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Light_Updater"
 	
-	TACO-FLAKE
-
 	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 1 hour. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Light_Updater"
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 d4ec32c..5e95a01 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,50 @@
 #!/usr/bin/env bash
 
-FLATPAK () {
-
-if ! ssh root@localhost 'flatpak update -y' ; then
-
-	zenity --error \
-	--width=550 \
-	--title="Sovran_SystemsOS_Updater" \
-	--text="Could Not Update Flatpaks."
-
-	exit 1
-
-fi
-
-}
-
-
-SPICE-FLAKE () {
-
-time_stamp=$(date +%Y-%m-%d-%T)
+LOGIN () {
 
 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"
+time_stamp=$(date +%Y-%m-%d-%T)
+
+ssh root@localhost flatpak update -y &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Login_Log.txt
 
 }
 
-
-TACO-FLAKE () {
+HUNGRY () {
 
 pushd /home/free/Documents/Updater_App_Logs
 
 file=$(ls -Art | tail -n 1)
 
-if grep -w "nix: error" $file ; then
+if grep -w "Permission denied" $file ; then
 	
+	zenity --error \
+	--width=500 \
+	--title="Sovran_SystemsOS_Updater" \
+	--text="Authentication canceled. Exiting..."
+exit 1
+
+fi
+	
+popd
+	
+}
+
+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
+
 	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
+	exit 1
 
 fi
 
-popd
-
 }
 
 PANCAKE-FLAKE () {
@@ -63,7 +62,7 @@ if ! grep -w "updating" $file ; then
 	--title="Sovran_SystemsOS_Updater" \
 	--text="There are no updates at this time. Your Sovran Pro is up to date!"	
  
- exit 1
+ exit 0
 
 fi
 
@@ -71,13 +70,10 @@ 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 && nixos-rebuild switch --impure 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Log.txt'"
 
 }
@@ -115,23 +111,23 @@ popd
 
 curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" |
 
-zenity --text-info \
---width=1100 \
---height=830 \
---title="Sovran_SystemsOS_Updater"
+	zenity --text-info \
+	--width=1100 \
+	--height=830 \
+	--title="Sovran_SystemsOS_Updater"
 
 if [[ $? -eq 1 ]]; then
 
 	exit 1
 
 else
-
-	FLATPAK | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Updater"
 	
-	SPICE-FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Updater"
+	LOGIN | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Updater" 
+	
+	HUNGRY
+	
+	FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Updater"
 	
-	TACO-FLAKE
-
 	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"