updated both updater apps

This commit is contained in:
naturallaw77 2024-03-31 11:17:33 -07:00
parent c845299aba
commit 9cc1ae0574
2 changed files with 50 additions and 30 deletions

View File

@ -22,6 +22,7 @@ if grep -w "Permission denied" $file ; then
--width=500 \ --width=500 \
--title="Sovran_SystemsOS_Light_Updater" \ --title="Sovran_SystemsOS_Light_Updater" \
--text="Authentication Canceled. Exiting..." --text="Authentication Canceled. Exiting..."
exit 1 exit 1
fi fi
@ -38,7 +39,6 @@ ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Up
} }
PANCAKE-FLAKE () { PANCAKE-FLAKE () {
pushd /home/free/Documents/Updater_App_Logs pushd /home/free/Documents/Updater_App_Logs
@ -60,8 +60,7 @@ popd
} }
YOGURT-FLAKE () {
SPICE () {
pushd /home/free/Documents/Updater_App_Logs pushd /home/free/Documents/Updater_App_Logs
@ -78,14 +77,18 @@ if ! grep -w "updating" $file ; then
exit 1 exit 1
else fi
popd
}
SPICE () {
time_stamp=$(date +%Y-%m-%d-%T) time_stamp=$(date +%Y-%m-%d-%T)
xterm -T "Sovran_SystemsOS_Light_Updater" -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'cd /etc/nixos && nixos-rebuild switch --impure 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Log.txt'" xterm -T "Sovran_SystemsOS_Light_Updater" -fa 'Noto Mono' -fs 15 -fg white -bg black -e bash -c "ssh root@localhost 'cd /etc/nixos && nixos-rebuild switch --impure 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Log.txt'"
fi
} }
TACO () { TACO () {
@ -140,6 +143,8 @@ else
PANCAKE-FLAKE PANCAKE-FLAKE
YOGURT-FLAKE
SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system 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=1050 --pulsate --text="Updating entire system 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"
TACO TACO

View File

@ -21,7 +21,8 @@ if grep -w "Permission denied" $file ; then
zenity --error \ zenity --error \
--width=500 \ --width=500 \
--title="Sovran_SystemsOS_Updater" \ --title="Sovran_SystemsOS_Updater" \
--text="Authentication canceled. Exiting..." --text="Authentication Canceled. Exiting..."
exit 1 exit 1
fi fi
@ -34,7 +35,17 @@ FLAKE () {
time_stamp=$(date +%Y-%m-%d-%T) time_stamp=$(date +%Y-%m-%d-%T)
if ! ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt" ; then ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt"
}
PANCAKE-FLAKE () {
pushd /home/free/Documents/Updater_App_Logs
file=$(ls -Art | tail -n 1)
if grep -w "nix: error" $file ; then
zenity --error \ zenity --error \
--width=1300 \ --width=1300 \
@ -45,9 +56,11 @@ if ! ssh root@localhost "cd /etc/nixos && nix flake update &> /home/free/Documen
fi fi
popd
} }
PANCAKE-FLAKE () { YOGURT-FLAKE () {
pushd /home/free/Documents/Updater_App_Logs pushd /home/free/Documents/Updater_App_Logs
@ -62,7 +75,7 @@ if ! grep -w "updating" $file ; then
--title="Sovran_SystemsOS_Updater" \ --title="Sovran_SystemsOS_Updater" \
--text="There are no updates at this time. Your Sovran Pro is up to date!" --text="There are no updates at this time. Your Sovran Pro is up to date!"
exit 0 exit 1
fi fi
@ -113,7 +126,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr
zenity --text-info \ zenity --text-info \
--width=1100 \ --width=1100 \
--height=730 \ --height=830 \
--title="Sovran_SystemsOS_Updater" --title="Sovran_SystemsOS_Updater"
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
@ -130,7 +143,9 @@ else
PANCAKE-FLAKE PANCAKE-FLAKE
SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system 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" YOGURT-FLAKE
SPICE | zenity --progress --no-cancel --auto-close --width=1050 --pulsate --text="Updating entire system 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_Updater"
TACO TACO