Sovran_Systems/Software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated both updaters to better handed error notifications

Browse Source
This commit is contained in:
naturallaw77 2023-12-13 10:48:48 -08:00
parent 3bf9872d17
commit 3183e0b8d0
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Sovran_SystemsOS_Light_Updater/Updater Source Files/Update_Sovran_SystemsOS_Light.sh
View File

@ -1,10 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PASSWORD=$(zenity --password --title="User Password") FLATPAK () {
if ! ssh root@localhost 'flatpak update -y' ; then
:'
HOME () {
if ! echo $PASSWORD | sudo -S flatpak update -y ; then
zenity --error \ zenity --error \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS_Light Updater" \
@ -14,24 +11,33 @@ if ! echo $PASSWORD | sudo -S flatpak update -y ; then
fi 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 \ zenity --error \
--width=400 \ --width=500 \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS_Light Updater" \
--text="Could not complete the Nix Flake update." --text="Could not complete the Sovran_SystemsOS_Light update."
exit 1 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 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" | curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovran_SystemsOS_Light_Updater/Updater%20Source%20Files/Intro.md" |
zenity --text-info \ zenity --text-info \
@ -41,11 +47,13 @@ zenity --text-info \
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
exit 1 exit 1
else 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 fi

36
Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh
View File

@ -3,34 +3,34 @@
FLATPAK () { FLATPAK () {
if ! ssh root@localhost 'flatpak update -y' ; then if ! ssh root@localhost 'flatpak update -y' ; then
zenity --error \ zenity --error \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS Updater" \
--text="Could Not Update Flatpaks." --text="Could Not Update Flatpaks."
exit 1 exit 1
fi fi
} }
SPICE () { 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 \ zenity --error \
--width=400 \ --width=400 \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS Updater" \
--text="Could not complete the update." --text="Could not complete the Sovran_SystemsOS update."
exit 1 exit 1
else else
zenity --info \ zenity --info \
--ellipsize \ --ellipsize \
--no-wrap \ --no-wrap \
--width=500 \ --width=500 \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS Updater" \
--text="Yay complete! Please reboot when you are ready." --text="Yay complete! Please reboot when you are ready."
fi 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 \ zenity --text-info \
--width=1000 \ --width=1000 \
--height=750 \ --height=750 \
--title="Sovran_SystemsOS_Light Updater" --title="Sovran_SystemsOS Updater"
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
exit 1 exit 1
else 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 fi