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

updated both updaters with new error notification

Browse Source
This commit is contained in:
naturallaw77 2023-12-12 13:57:21 -08:00
parent b9eda1a55e
commit 13f679097e
2 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,9 @@
!/usr/bin/env bash #!/usr/bin/env bash
FLATPAK () { PASSWORD=$(zenity --password --title="Your User Password")
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" \
@ -11,23 +13,38 @@ exit 1
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=400 \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS_Light Updater" \
--text="Could not complete the update." --text="Could not complete the Nix Flake update."
exit 1 exit 1
fi fi
} if ! echo $PASSWORD | sudo -S 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_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" |
@ -42,16 +59,7 @@ exit 1
else else
FLATPAK 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"
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"
zenity --info \
--ellipsize \
--no-wrap \
--width=500 \
--title="Sovran_SystemsOS_Light Updater" \
--text="Yay complete! Please reboot when you are ready."
fi fi

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

@ -1,9 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PASSWORD=$(zenity --password --title="Main Password") FLATPAK () {
if ! ssh root@localhost 'flatpak update -y' ; then
HOME () {
if ! echo $PASSWORD | sudo -S -u root flatpak update -y ; then
zenity --error \ zenity --error \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS_Light Updater" \
@ -13,23 +11,15 @@ if ! echo $PASSWORD | sudo -S -u root flatpak update -y ; then
fi fi
if ! echo $PASSWORD | cd /etc/nixos && sudo -S -u root 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=400 \
--title="Sovran_SystemsOS_Light Updater" \ --title="Sovran_SystemsOS_Light Updater" \
--text="Could not complete the Nix Flake update." --text="Could not complete the 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 exit 1
@ -46,6 +36,8 @@ 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 \
@ -59,7 +51,9 @@ exit 1
else else
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" 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_Light Updater"
fi fi