diff --git a/setup/so-functions b/setup/so-functions index 9d09bce7f..ad876fabd 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -99,7 +99,7 @@ analyst_salt_local() { read -r -d '' message <<- EOM Finished Analyst workstation installation. - Press ENTER to reboot. + Press the Enter key to reboot. EOM whiptail --title "$whiptail_title" --msgbox "$message" 12 75 @@ -2003,7 +2003,7 @@ set_main_ip() { info "ERROR: Could not determine MAINIP or MNIC_IP." info "MAINIP=$MAINIP" info "MNIC_IP=$MNIC_IP" - whiptail_error_message "The management IP could not be determined. Please check the log at /root/sosetup.log and verify the network configuration. Press OK to exit." + whiptail_error_message "The management IP could not be determined. Please check the log at /root/sosetup.log and verify the network configuration. Select OK to exit." exit 1 fi sleep 1 diff --git a/setup/so-whiptail b/setup/so-whiptail index 81b1b2301..d857283c7 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -284,7 +284,7 @@ whiptail_dhcp_warn() { local interaction_text="Select YES to keep DHCP or NO to go back." local window_type="yesno" else - local interaction_text="Press ENTER to continue." + local interaction_text="Press the Enter key to continue." local window_type="msgbox" fi @@ -422,7 +422,7 @@ whiptail_end_settings() { read -r -d '' msg <<-EOM $end_msg - Press TAB to select yes or no. + Press the Tab key to select yes or no. EOM whiptail --title "The following options have been set, would you like to proceed?" --yesno "$msg" 24 75 --scrolltext @@ -929,7 +929,7 @@ whiptail_manager_updates_warning() { [ -n "$TESTING" ] && return whiptail --title "$whiptail_title"\ - --msgbox "Updating through the manager node requires the manager to have access to the Internet. Press ENTER to continue."\ + --msgbox "Updating through the manager node requires the manager to have access to the Internet. Press the Enter key to continue."\ 8 75 local exitstatus=$? @@ -1115,7 +1115,7 @@ whiptail_requirements_error() { [ -n "$TESTING" ] && return whiptail --title "$whiptail_title" \ - --yesno "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Press YES to continue anyway, or press NO to cancel." 10 75 + --yesno "This machine currently has $current_val $requirement_needed, but needs $needed_val to meet minimum requirements. Select YES to continue anyway, or select NO to cancel." 10 75 local exitstatus=$? whiptail_check_exitstatus $exitstatus @@ -1237,7 +1237,7 @@ whiptail_setup_complete() { read -r -d '' message <<- EOM Finished ${install_type} installation. $accessMessage - Press ENTER to exit setup. + Press the Enter key to exit setup. EOM whiptail --title "$whiptail_title" --msgbox "$message" 12 75 @@ -1257,7 +1257,7 @@ whiptail_setup_failed() { read -r -d '' message <<- EOM Install had a problem. Please see $setup_log for details.\n $check_err_msg - Press Ok to exit. + Select Ok to exit. EOM whiptail --title "$whiptail_title" --msgbox "$message" $height 75 @@ -1300,7 +1300,7 @@ whiptail_storage_requirements() { Visit https://docs.securityonion.net/en/2.4/hardware.html for more information. - Press YES to continue anyway, or press NO to cancel. + Select YES to continue anyway, or select NO to cancel. EOM whiptail \