From 92bb62ef3a99737656b3c91af0995bcadfd79222 Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Mon, 11 Dec 2023 15:54:29 -0800 Subject: [PATCH] updated the Sovran_SystemsOS and Sovran_SystemsOS_Light updater --- .../Update_Sovran_SystemsOS_Light.sh | 32 +++++++++---------- .../Update_Sovran_SystemsOS.sh | 24 +++++++------- 2 files changed, 27 insertions(+), 29 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 a2ac2d8..82494d0 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 @@ -14,27 +14,25 @@ fi } SPICE () { -xterm -T "Sovran_SystemsOS_Light 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'" +if ! xterm -T "Sovran_SystemsOS_Light 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'" ; then -if [[ $? != 1 ]] ; then + zenity --error \ + --width=400 \ + --title="Sovran_SystemsOS_Light Updater" \ + --text="Could not complete the update." -zenity --info \ ---ellipsize \ ---no-wrap \ ---width=700 \ ---title="Sovran_SystemsOS_Light Updater" \ ---text="Yay complete! Please reboot when you are ready." - -exit 1 + exit 1 else -zenity --error \ ---width=700 \ ---title="Sovran_SystemsOS_Light Updater" \ ---text="Could not complete the update." + zenity --info \ + --ellipsize \ + --no-wrap \ + --width=500 \ + --title="Sovran_SystemsOS_Light Updater" \ + --text="Yay complete! Please reboot when you are ready." -exit 2 + exit 1 fi @@ -46,7 +44,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr zenity --text-info \ --width=1000 \ ---height=700 \ +--height=750 \ --title="Sovran_SystemsOS_Light Updater" if [[ $? -eq 1 ]]; then @@ -57,7 +55,7 @@ else FLATPAK -SPICE | zenity --progress --no-cancel --auto-close --width=650 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please Be Patient..." --title="Sovran_SystemsOS_Light Updater" +SPICE | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Please Be Patient..." --title="Sovran_SystemsOS_Light Updater" fi 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 f319d8d..644501c 100755 --- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh +++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh @@ -17,23 +17,23 @@ fi SPICE () { if ! 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'" ; then -zenity --error \ ---width=400 \ ---title="Sovran_SystemsOS Updater" \ ---text="Could not complete the update." + zenity --error \ + --width=400 \ + --title="Sovran_SystemsOS Updater" \ + --text="Could not complete the update." -exit 1 + exit 1 else -zenity --info \ ---ellipsize \ ---no-wrap \ ---width=500 \ ---title="Sovran_SystemsOS Updater" \ ---text="Yay complete! Please reboot when you are ready." + zenity --info \ + --ellipsize \ + --no-wrap \ + --width=500 \ + --title="Sovran_SystemsOS Updater" \ + --text="Yay complete! Please reboot when you are ready." -exit 1 + exit 1 fi