fix formatting

This commit is contained in:
Mike Reeves
2022-04-01 15:52:38 -04:00
parent 76f43380d9
commit a449a91f38
2 changed files with 21 additions and 22 deletions

View File

@@ -234,36 +234,36 @@ if ! [[ -f $install_opt_file ]]; then
echo "User cancelled setup." | tee -a "$setup_log" echo "User cancelled setup." | tee -a "$setup_log"
whiptail_cancel whiptail_cancel
fi fi
if [[ $is_analyst ]]; then if [[ $is_analyst ]]; then
collect_hostname collect_hostname
if [[ $is_analyst_iso ]]; then if [[ $is_analyst_iso ]]; then
# Prompt Network Setup # Prompt Network Setup
whiptail_management_nic whiptail_management_nic
whiptail_dhcp_or_static whiptail_dhcp_or_static
if [ "$address_type" != 'DHCP' ]; then if [ "$address_type" != 'DHCP' ]; then
collect_int_ip_mask collect_int_ip_mask
collect_gateway collect_gateway
collect_dns collect_dns
collect_dns_domain collect_dns_domain
fi fi
fi fi
if [[ ! $is_analyst_iso ]]; then if [[ ! $is_analyst_iso ]]; then
# This should be a network install # This should be a network install
whiptail_network_notice whiptail_network_notice
whiptail_dhcp_warn whiptail_dhcp_warn
whiptail_management_nic whiptail_management_nic
fi fi
whiptail_network_init_notice whiptail_network_init_notice
network_init network_init
printf '%s\n' \ printf '%s\n' \
"MNIC=$MNIC" \ "MNIC=$MNIC" \
"HOSTNAME=$HOSTNAME" > "$net_init_file" "HOSTNAME=$HOSTNAME" > "$net_init_file"
set_main_ip >> $setup_log 2>&1 set_main_ip >> $setup_log 2>&1
compare_main_nic_ip compare_main_nic_ip
fi fi
if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then if [[ $setup_type == 'iso' ]] && [ "$automated" == no ]; then
whiptail_first_menu_iso whiptail_first_menu_iso

View File

@@ -45,7 +45,6 @@ whiptail_analyst_install() {
NOTE: Selecting "no" will enable X Windows and set it to load at boot. NOTE: Selecting "no" will enable X Windows and set it to load at boot.
EOM EOM
echo "whiptail"
whiptail --title "$whiptail_title" \ whiptail --title "$whiptail_title" \
--yesno "$message" 11 75 --defaultno --yesno "$message" 11 75 --defaultno