From 3183e0b8d061f8e86c60824b5b5162e65b01c1bf Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Wed, 13 Dec 2023 10:48:48 -0800 Subject: [PATCH] updated both updaters to better handed error notifications --- .../Update_Sovran_SystemsOS_Light.sh | 38 +++++++++++-------- .../Update_Sovran_SystemsOS.sh | 36 +++++++++--------- 2 files changed, 41 insertions(+), 33 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 cf9b26d..993f7d6 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,10 +1,7 @@ #!/usr/bin/env bash -PASSWORD=$(zenity --password --title="User Password") - -:' -HOME () { -if ! echo $PASSWORD | sudo -S flatpak update -y ; then +FLATPAK () { +if ! ssh root@localhost 'flatpak update -y' ; then zenity --error \ --title="Sovran_SystemsOS_Light Updater" \ @@ -14,24 +11,33 @@ if ! echo $PASSWORD | sudo -S flatpak update -y ; then fi -if ! echo $PASSWORD | cd /etc/nixos && sudo -S nix flake update ; then +} + +SPICE () { +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 zenity --error \ - --width=400 \ + --width=500 \ --title="Sovran_SystemsOS_Light Updater" \ - --text="Could not complete the Nix Flake update." + --text="Could not complete the Sovran_SystemsOS_Light update." exit 1 +else + + zenity --info \ + --ellipsize \ + --no-wrap \ + --width=500 \ + --title="Sovran_SystemsOS_Light Updater" \ + --text="Yay complete! Please reboot when you are ready." + fi -' - -HOME () { -xterm -T "Sovran_SystemsOS_Light Updater" -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "PASSWORD=$(zenity --password --title="User Password") Z1=$(zenity --error --width=400 --title="Sovran_SystemsOS_Light Updater" --text="Could not complete the NixOS update.") Z2=$(zenity --info --ellipsize --no-wrap --width=500 --title="Sovran_SystemsOS_Light Updater" --text="Yay complete! Please reboot when you are ready.") if ! echo $PASSWORD | sudo -S nixos-rebuild switch ; then $Z1 exit 1 else $Z2 fi" - } +######### + curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" | zenity --text-info \ @@ -41,11 +47,13 @@ zenity --text-info \ if [[ $? -eq 1 ]]; then -exit 1 + exit 1 else -HOME | zenity --progress --no-cancel --auto-close --width=660 --pulsate --text="Updating Sovran_SystemsOS now. In rare cases, it could take up to 3 hours. Please be patient..." --title="Sovran_SystemsOS_Light Updater" + FLATPAK | zenity --progress --no-cancel --auto-close --width=460 --pulsate --text="Updating Flatpaks now..." --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 f7ae86d..6a29ee9 100755 --- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh +++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh @@ -3,34 +3,34 @@ FLATPAK () { if ! ssh root@localhost 'flatpak update -y' ; then -zenity --error \ ---title="Sovran_SystemsOS_Light Updater" \ ---text="Could Not Update Flatpaks." + zenity --error \ + --title="Sovran_SystemsOS Updater" \ + --text="Could Not Update Flatpaks." -exit 1 + exit 1 fi } SPICE () { -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 ! 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_Light Updater" \ - --text="Could not complete the update." + --title="Sovran_SystemsOS Updater" \ + --text="Could not complete the Sovran_SystemsOS update." exit 1 else -zenity --info \ ---ellipsize \ ---no-wrap \ ---width=500 \ ---title="Sovran_SystemsOS_Light 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." fi @@ -38,22 +38,22 @@ fi ######### -curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" | +curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" | zenity --text-info \ --width=1000 \ --height=750 \ ---title="Sovran_SystemsOS_Light Updater" +--title="Sovran_SystemsOS Updater" if [[ $? -eq 1 ]]; then -exit 1 + exit 1 else -FLATPAK + FLATPAK | zenity --progress --no-cancel --auto-close --width=460 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS 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" + 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 Updater" fi