diff --git a/setup/so-functions b/setup/so-functions index 736f2e15b..8a51a8b31 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2060,16 +2060,6 @@ print_salt_state_apply() { echo "Applying $state Salt state" } -progress() { - local msg=${1:-'Please wait while installing...'} - - if [ $automated == no ]; then - whiptail --title "$whiptail_title" --gauge "$msg" 6 70 0 # append to text - else - cat >> $setup_log 2>&1 - fi -} - proxy_validate() { echo "Testing proxy..." local test_url="https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS" diff --git a/setup/so-setup b/setup/so-setup index 5f4329750..88a4daa5a 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -142,7 +142,15 @@ catch() { exit 1 } automated=no -progress +progress() { + local msg=${1:-'Please wait while installing...'} + + if [ $automated == no ]; then + whiptail --title "$whiptail_title" --gauge "$msg" 6 70 0 # append to text + else + cat >> $setup_log 2>&1 + fi +} if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1