From owner-svn-src-all@freebsd.org Tue Dec 13 02:29:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81EF1C74867; Tue, 13 Dec 2016 02:29:21 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 517E31ED5; Tue, 13 Dec 2016 02:29:21 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBD2TKuD063193; Tue, 13 Dec 2016 02:29:20 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBD2TKXE063192; Tue, 13 Dec 2016 02:29:20 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201612130229.uBD2TKXE063192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Tue, 13 Dec 2016 02:29:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309987 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 02:29:21 -0000 Author: dteske Date: Tue Dec 13 02:29:20 2016 New Revision: 309987 URL: https://svnweb.freebsd.org/changeset/base/309987 Log: There's an API function for displaying yes/no dialogs Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 02:27:38 2016 (r309986) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 02:29:20 2016 (r309987) @@ -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