From 79213219b3c8b8f7d8a3e86a33128d9744f4e38c Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Mon, 4 Dec 2023 00:59:09 -0800
Subject: [PATCH] updated updater fix

---
 .../Update_Sovran_SystemsOS.sh                | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 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 a263584..031cd40 100755
--- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
+++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh	
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 set -o nounset
-
-curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" |
 		
 	zenity --text-info \
 		--title="Sovran_SystemsOS Updater" \
+		--html \
+		--url="https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" \
 		--width=1000 \
 		--height=700
 
@@ -14,33 +14,13 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr
 		exit 1
 
 	else
-	
-		if ! ssh root@localhost 'flatpak update -y |
 
-			zenity --progress \
-				--no-cancel \
-				--auto-close \
-				--pulsate \
-				--width=500 \
-				--text="Updating Flatpaks" \
-				--title="Sovran_SystemsOS Updater"'; then
+		if ! xterm -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'flatpak update -y && cd /etc/nixos && nix flake update && nixos-rebuild switch --impure'"; then
 				
-				echo "Could Not Update Flatpaks -- Exiting" |
-				
-					zenity --text-info \
-						--width=400 \
-						--title="Sovran_SystemsOS Updater"
-			exit 1
-
-		fi	
-
-		if ! 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'"; then
-			
-			echo "Could Not Update Sovran_SystemsOS -- Exiting" |
-				
-				zenity --text-info \
+				zenity --info \
 					--width=400 \
-					--title="Sovran_SystemsOS Updater"
+					--title="Sovran_SystemsOS Updater" \
+					--text="Could Not Update Sovran_SystemsOS -- Exiting"
 
 		exit 1