From: dteske Date: Tue, 13 Dec 2016 02:29:20 +0000 (+0000) Subject: There's an API function for displaying yes/no dialogs X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=52245df7f6b33b4f50489c506891b084c130ff05;p=people%2Froyger%2Ffreebsd.git There's an API function for displaying yes/no dialogs --- diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index 08800faa5b42..1eed3f0cdba0 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -196,11 +196,7 @@ if [ "$BSDINSTALL_CONFIGCURRENT" ]; then [ "$DEF_REGDOMAIN" = 0 ] && DEF_REGDOMAIN="" [ "$DEF_COUNTRY" = 0 ] && DEF_COUNTRY="" f_dialog_title "Regdomain/country" - $DIALOG \ - --title "$DIALOG_TITLE" \ - --backtitle "$DIALOG_BACKTITLE" \ - --yesno "Change regdomain/country (now $DEF_REGDOMAIN/$DEF_COUNTRY)?" \ - 0 0 + f_yesno "Change regdomain/country (now $DEF_REGDOMAIN/$DEF_COUNTRY)?" if [ $? -eq 0 ]; then while :; do dialog_country_select "$DEF_REGDOMAIN" "$DEF_COUNTRY" @@ -230,11 +226,7 @@ while :; do if [ ! "$NETWORKS" ]; then f_dialog_title "$msg_error" - $DIALOG \ - --title "$DIALOG_TITLE" \ - --backtitle "$DIALOG_BACKTITLE" \ - --yesno "No wireless networks were found. Rescan?" \ - 0 0 && continue + f_yesno "No wireless networks were found. Rescan?" && continue exit 1 fi