diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index ff5331584..8616f8489 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -1098,7 +1098,7 @@ upgrade_check() { } upgrade_check_salt() { - NEWSALTVERSION=$(grep version: $UPDATE_DIR/salt/salt/master.defaults.yaml | awk '{print $2}') + NEWSALTVERSION=$(grep "version:" $UPDATE_DIR/salt/salt/master.defaults.yaml | grep -o "[0-9]\+\.[0-9]\+") if [ "$INSTALLEDSALTVERSION" == "$NEWSALTVERSION" ]; then echo "You are already running the correct version of Salt for Security Onion." else @@ -1244,26 +1244,6 @@ failed_soup_restore_items() { masterunlock } -#upgrade salt to 3004.1 -#2_3_10_hotfix_1() { -# systemctl_func "stop" "$cron_service_name" -# # update mine items prior to stopping salt-minion and salt-master -# update_salt_mine -# stop_salt_minion -# stop_salt_master -# update_repo -# # Does salt need upgraded. If so update it. -# if [[ $UPGRADESALT -eq 1 ]]; then -# echo "Upgrading Salt" -# # Update the repo files so it can actually upgrade -# upgrade_salt -# fi -# systemctl_func "start" "salt-master" -# systemctl_func "start" "salt-minion" -# systemctl_func "start" "$cron_service_name" - -#} - main() { trap 'check_err $?' EXIT