From a65cf23dc272fc4e5f24a72bb7b07b1180347b9e Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Tue, 23 May 2023 09:07:58 -0700
Subject: [PATCH] updated 'Update_Sovran_SystemsOS' and added Info For
 Sovran_SystemsOS Updater

---
 .../Info For Sovran_SystemsOS Updater.md      | 10 ----
 .../Info For Sovran_SystemsOS Updater.txt     | 19 ++++++++
 .../Updater Files/Update_Sovran_SystemsOS     | 46 +++++++++++--------
 3 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.md
 create mode 100644 Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.txt

diff --git a/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.md b/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.md
deleted file mode 100644
index ca28670..0000000
--- a/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.md	
+++ /dev/null
@@ -1,10 +0,0 @@
-Welcome to the Sovran_SystemsOS Updater!
-
-This Updater will run through several stages.
-Be patient...
-Several windows will pop up during the process.
-When it is finished, a final pop up will say complete and then you can reboot when ready.
-All updates come from https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOSv2. Don't Trust, Verify!
-
-
-Enjoy!
\ No newline at end of file
diff --git a/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.txt b/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.txt
new file mode 100644
index 0000000..a4e5b95
--- /dev/null
+++ b/Sovran_SystemsOS_Updater/Updater Files/Info For Sovran_SystemsOS Updater.txt	
@@ -0,0 +1,19 @@
+Welcome to the Sovran_SystemsOS Updater!
+
+This updater will run through a few stages.
+
+Be patient...
+
+Several windows will pop up during the process. Keep clicking "OK."
+
+When it is finished, a final pop up will state "Complete" and then you can reboot when ready.
+
+All updates come from: 
+
+https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOSv2
+
+Don't Trust, Verify!
+
+After you have checked that the software is safe, then click "OK."
+
+Enjoy!
\ No newline at end of file
diff --git a/Sovran_SystemsOS_Updater/Updater Files/Update_Sovran_SystemsOS b/Sovran_SystemsOS_Updater/Updater Files/Update_Sovran_SystemsOS
index 05c2581..420fbf2 100755
--- a/Sovran_SystemsOS_Updater/Updater Files/Update_Sovran_SystemsOS	
+++ b/Sovran_SystemsOS_Updater/Updater Files/Update_Sovran_SystemsOS	
@@ -1,42 +1,52 @@
 #!/usr/bin/env bash
 
 
-zenity --text \
- --filename="$(curl https://git.sovransystems.com/Sovran_Systems/Sovran_Systems_Packages/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Files/Info%20For%20Sovran_SystemsOS%20Updater.md)" \
- --checkbox="I Agree" \
- --auto-scroll
+zenity --text-info \
+--filename="$(curl )" \
+--title="Sovran_SystemsOS Updater" \
+--width=850 \
+--height=730 \
+--auto-scroll
 
+if [[ $? -eq 1 ]]; then
+	zenity --info \
+	--title="Sovran_SystemsOS Updater" \
+  --text="Update Canceled By User"
+      
+      exit 1
+fi
 
 password=$(zenity --password --title="Sovran_SystemsOS Updater")
 
 	if [ $? -eq 1 ] ; then
 			
-			zenity --error \
+			zenity --info \
+			--title="Sovran_SystemsOS Updater" \
       --text="Update Canceled By User"
       
-      exit 1
+      exit 2
       
       else
 
 
-    	zenity --info \
-  			--ellipsize \
-  			--no-wrap \
-  			--title="Sovran_SystemsOS Updater" \
-  			--text="$(echo -e "$password" | sudo -S rsync -av /home/free/Documents/Sovran\ Systems/My\ NixOS\ Laptop/configuration.nix /etc/nixos/configuration.nix)"
- 	
+      echo -e "$password" | sudo -S rsync -av /home/free/Documents/Sovran\ Systems/My\ NixOS\ Laptop/configuration.nix /etc/nixos/configuration.nix 
+
+			
 			pushd /etc/nixos/
 
-			zenity --info \
-  			--ellipsize \
-  			--no-wrap \
-  			--title="Sovran_SystemsOS Updater" \
-  			--text="$(echo -e $password | sudo -S nix flake update)"
+			echo -e $password | sudo -S nix flake update
 
 			popd
 
-			echo -e $password | sudo -S nixos-rebuild switch --impure | zenity --progress --no-cancel --auto-close --pulsate --title="Sovran_SystemsOS Updater"
+			
+			echo -e $password | sudo -S nixos-rebuild switch --impure |
+			zenity --progress \
+			--no-cancel \
+			--auto-close \
+			--pulsate \
+			--title="Sovran_SystemsOS Updater"
 
+			
 			zenity --info \
 			--ellipsize \
 			--no-wrap \