updated both updaters

This commit is contained in:
naturallaw77 2024-03-30 14:20:20 -07:00
parent b6659d7ff6
commit 4e68abcfc6
2 changed files with 70 additions and 78 deletions

View File

@ -1,51 +1,50 @@
#!/usr/bin/env bash #!/usr/bin/env bash
FLATPAK () { LOGIN () {
if ! ssh root@localhost 'flatpak update -y' ; then
zenity --error \
--width=550 \
--title="Sovran_SystemsOS_Light_Updater" \
--text="Could Not Update Flatpaks."
exit 1
fi
}
SPICE-FLAKE () {
time_stamp=$(date +%Y-%m-%d-%T)
mkdir -p /home/free/Documents/Updater_App_Logs mkdir -p /home/free/Documents/Updater_App_Logs
ssh root@localhost "cd /etc/nixos && nix flake update 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt" time_stamp=$(date +%Y-%m-%d-%T)
ssh root@localhost flatpak update -y &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Login_Log.txt
} }
HUNGRY () {
TACO-FLAKE () {
pushd /home/free/Documents/Updater_App_Logs pushd /home/free/Documents/Updater_App_Logs
file=$(ls -Art | tail -n 1) file=$(ls -Art | tail -n 1)
if grep -w "nix: error" $file ; then if grep -w "Permission denied" $file ; then
zenity --error \
--width=500 \
--title="Sovran_SystemsOS_Light_Updater" \
--text="Authentication canceled. Exiting..."
exit 1
fi
popd
}
FLAKE () {
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
zenity --error \ zenity --error \
--width=1300 \ --width=1300 \
--title="Sovran_SystemsOS_Light_Updater" \ --title="Sovran_SystemsOS_Light_Updater" \
--text="Could not complete the Flake update. Check the Updater_Flake_Log.txt in your Documents under Updater_App_Logs folder for more details." --text="Could not complete the Flake update. Check the Updater_Flake_Log.txt in your Documents under Updater_App_Logs folder for more details."
exit 1 exit 1
fi fi
popd
} }
PANCAKE-FLAKE () { PANCAKE-FLAKE () {
@ -63,7 +62,7 @@ if ! grep -w "updating" $file ; then
--title="Sovran_SystemsOS_Light_Updater" \ --title="Sovran_SystemsOS_Light_Updater" \
--text="There are no updates at this time. Your Sovran Book Pro is up to date!" --text="There are no updates at this time. Your Sovran Book Pro is up to date!"
exit 1 exit 0
fi fi
@ -71,13 +70,10 @@ popd
} }
SPICE () { SPICE () {
time_stamp=$(date +%Y-%m-%d-%T) time_stamp=$(date +%Y-%m-%d-%T)
mkdir -p /home/free/Documents/Updater_App_Logs
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'"
} }
@ -115,23 +111,23 @@ popd
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 \
--width=1100 \ --width=1100 \
--height=830 \ --height=830 \
--title="Sovran_SystemsOS_Light_Updater" --title="Sovran_SystemsOS_Light_Updater"
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
exit 1 exit 1
else else
FLATPAK | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Light_Updater"
SPICE-FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Light_Updater" LOGIN | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Light_Updater"
HUNGRY
FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Light_Updater"
TACO-FLAKE
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 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"

View File

@ -1,51 +1,50 @@
#!/usr/bin/env bash #!/usr/bin/env bash
FLATPAK () { LOGIN () {
if ! ssh root@localhost 'flatpak update -y' ; then
zenity --error \
--width=550 \
--title="Sovran_SystemsOS_Updater" \
--text="Could Not Update Flatpaks."
exit 1
fi
}
SPICE-FLAKE () {
time_stamp=$(date +%Y-%m-%d-%T)
mkdir -p /home/free/Documents/Updater_App_Logs mkdir -p /home/free/Documents/Updater_App_Logs
ssh root@localhost "cd /etc/nixos && nix flake update 2>&1 | tee /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Flake_Log.txt" time_stamp=$(date +%Y-%m-%d-%T)
ssh root@localhost flatpak update -y &> /home/free/Documents/Updater_App_Logs/{$time_stamp}-Updater_Login_Log.txt
} }
HUNGRY () {
TACO-FLAKE () {
pushd /home/free/Documents/Updater_App_Logs pushd /home/free/Documents/Updater_App_Logs
file=$(ls -Art | tail -n 1) file=$(ls -Art | tail -n 1)
if grep -w "nix: error" $file ; then if grep -w "Permission denied" $file ; then
zenity --error \
--width=500 \
--title="Sovran_SystemsOS_Updater" \
--text="Authentication canceled. Exiting..."
exit 1
fi
popd
}
FLAKE () {
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
zenity --error \ zenity --error \
--width=1300 \ --width=1300 \
--title="Sovran_SystemsOS_Updater" \ --title="Sovran_SystemsOS_Updater" \
--text="Could not complete the Flake update. Check the Updater_Flake_Log.txt in your Documents under Updater_App_Logs folder for more details." --text="Could not complete the Flake update. Check the Updater_Flake_Log.txt in your Documents under Updater_App_Logs folder for more details."
exit 1 exit 1
fi fi
popd
} }
PANCAKE-FLAKE () { PANCAKE-FLAKE () {
@ -63,7 +62,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 1 exit 0
fi fi
@ -71,13 +70,10 @@ popd
} }
SPICE () { SPICE () {
time_stamp=$(date +%Y-%m-%d-%T) time_stamp=$(date +%Y-%m-%d-%T)
mkdir -p /home/free/Documents/Updater_App_Logs
xterm -T "Sovran_SystemsOS_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_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'"
} }
@ -115,23 +111,23 @@ popd
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_Updater/Updater%20Source%20Files/Intro.md" |
zenity --text-info \ zenity --text-info \
--width=1100 \ --width=1100 \
--height=830 \ --height=830 \
--title="Sovran_SystemsOS_Updater" --title="Sovran_SystemsOS_Updater"
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
exit 1 exit 1
else else
FLATPAK | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Updater"
SPICE-FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Updater" LOGIN | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flatpaks now..." --title="Sovran_SystemsOS_Updater"
HUNGRY
FLAKE | zenity --progress --no-cancel --auto-close --width=500 --pulsate --text="Updating Flake now..." --title="Sovran_SystemsOS_Updater"
TACO-FLAKE
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" 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"