From ecd77647e7227a2ea3d49dee82cd102b8313885c Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Sat, 2 Dec 2023 12:35:52 -0800 Subject: [PATCH] updated updater fix --- .../Updater Source Files/Update_Sovran_SystemsOS.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 2ece12d..7623d69 100755 --- a/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh +++ b/Sovran_SystemsOS_Updater/Updater Source Files/Update_Sovran_SystemsOS.sh @@ -3,10 +3,7 @@ set -o nounset -ID=$(dig @resolver4.opendns.com myip.opendns.com +short -4) - -ID6=$(dig -t aaaa +short myip.opendns.com @resolver1.opendns.com) - +ID=$(timeout 1 -k dig @resolver4.opendns.com myip.opendns.com +short -4 || timeout 1 dig -t aaaa +short myip.opendns.com @resolver1.opendns.com) @@ -24,7 +21,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr else - ssh root@${ID} 'flatpak update -y' || ssh root@${ID6} 'flatpak update -y' | + ssh root@${ID} 'flatpak update -y' | zenity --progress \ --no-cancel \ @@ -47,7 +44,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr fi - ssh root@${ID} 'cd /etc/nixos; nix flake update' || ssh root@${ID6} 'cd /etc/nixos; nix flake update' | + ssh root@${ID} 'cd /etc/nixos; nix flake update' | zenity --progress \ --no-cancel \ @@ -69,7 +66,7 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr fi - ssh root@${ID} 'nixos-rebuild switch --impure' || ssh root@${ID6} 'nixos-rebuild switch --impure' | + ssh root@${ID} 'nixos-rebuild switch --impure' | zenity --progress \ --no-cancel \ @@ -101,3 +98,4 @@ curl "https://git.sovransystems.com/Sovran_Systems/Software/raw/branch/main/Sovr fi exit 0 +S \ No newline at end of file