From e3d8d1f745bbeb79a0059a0318514baf5ec4ae0a Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Tue, 12 Dec 2023 13:42:26 -0800 Subject: [PATCH] updated the updater with new error notification --- .../Update_Sovran_SystemsOS.sh | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 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 bcf0403..e3f66fe 100755 --- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh +++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh @@ -1,58 +1,63 @@ -!/usr/bin/env bash +#!/usr/bin/env bash -FLATPAK () { -if ! ssh root@localhost 'flatpak update -y' ; then +PASSWORD=$(zenity --password --title="Main Password") + +HOME () { +if ! echo $PASSWORD | sudo -S -u root flatpak update -y ; then zenity --error \ - --width=600 \ - --title="Sovran_SystemsOS Updater" \ + --title="Sovran_SystemsOS_Light Updater" \ --text="Could Not Update Flatpaks." exit 1 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 +if ! echo $PASSWORD | cd /etc/nixos && sudo -S -u root nix flake update ; then zenity --error \ --width=400 \ - --title="Sovran_SystemsOS Updater" \ - --text="Could not complete the update." + --title="Sovran_SystemsOS_Light Updater" \ + --text="Could not complete the Nix Flake update." exit 1 fi +if ! echo $PASSWORD | sudo -S -u root nixos-rebuild switch --impure ; then + + zenity --error \ + --width=400 \ + --title="Sovran_SystemsOS_Light Updater" \ + --text="Could not complete the NixOS 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 + } -######### - -curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" | +curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" | zenity --text-info \ --width=1000 \ --height=750 \ ---title="Sovran_SystemsOS Updater" +--title="Sovran_SystemsOS_Light Updater" if [[ $? -eq 1 ]]; then exit 1 -else - -FLATPAK - -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" - -zenity --info \ ---ellipsize \ ---no-wrap \ ---width=500 \ ---title="Sovran_SystemsOS Updater" \ ---text="Yay complete! Please reboot when you are ready." +HOME | 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