From b57ad193d27fc2273566c7ed9553c9cd66907b3e Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Thu, 14 Mar 2024 11:58:32 -0700 Subject: [PATCH] updated both updater scripts --- .../Update_Sovran_SystemsOS_Light.sh | 4 +-- .../Update_Sovran_SystemsOS.sh | 30 +++++++++---------- 2 files changed, 16 insertions(+), 18 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 0f7ce27..544302b 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 @@ -19,7 +19,7 @@ time_stamp=$(date +%Y-%m-%d-%T) mkdir -p /home/free/Documents/Updater_App_Logs -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 ! 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'" ; then zenity --error \ --width=500 \ @@ -58,7 +58,7 @@ else 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=750 --pulsate --text="Updating now. In rare cases, it could take up to 1 hour. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Light Updater" + SPICE | zenity --progress --no-cancel --auto-close --width=750 --pulsate --text="Updating now. In rare cases, it could take up to 1 hour. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS_Light Updater" find /home/free/Documents/Updater_App_Logs -name "*.txt" -type f -mtime +5 -delete 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 3edabf3..5850671 100755 --- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh +++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh @@ -13,36 +13,34 @@ fi } - SPICE () { - time_stamp=$(date +%Y-%m-%d-%T) +time_stamp=$(date +%Y-%m-%d-%T) - mkdir -p /home/free/Documents/Updater_App_Logs +mkdir -p /home/free/Documents/Updater_App_Logs - 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 \ + zenity --error \ + --width=500 \ --title="Sovran_SystemsOS Updater" \ --text="Could not complete the Sovran_SystemsOS 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." fi } - ######### curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Updater/Updater%20Source%20Files/Intro.md" | @@ -60,10 +58,10 @@ else 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=850 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS Updater" + SPICE | zenity --progress --no-cancel --auto-close --width=750 --pulsate --text="Updating now. In rare cases, it could take up to 3 hours. Go have some herbal tea and relax while the update is in progress." --title="Sovran_SystemsOS Updater" find /home/free/Documents/Updater_App_Logs -name "*.txt" -type f -mtime +5 -delete fi -exit 0 +exit 0 \ No newline at end of file