From owner-svn-src-head@freebsd.org Tue Dec 13 00:22:02 2016 Return-Path: Delivered-To: svn-src-head@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 93C0FC737ED; Tue, 13 Dec 2016 00:22:02 +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 4AFCB1FE7; Tue, 13 Dec 2016 00:22:02 +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 uBD0M1nv013788; Tue, 13 Dec 2016 00:22:01 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBD0M1BU013787; Tue, 13 Dec 2016 00:22:01 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201612130022.uBD0M1BU013787@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 00:22:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309961 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 00:22:02 -0000 Author: dteske Date: Tue Dec 13 00:22:01 2016 New Revision: 309961 URL: https://svnweb.freebsd.org/changeset/base/309961 Log: Stop repeating strings (centralize prompt string) NB: Changes to strings now only affect a single line Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 00:18:51 2016 (r309960) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 00:22:01 2016 (r309961) @@ -85,7 +85,7 @@ country_set() dialog_country_select() { - local input regdomains countries regdomain country + local input regdomains countries regdomain country prompt local no_default="" local default_regdomain="${1:-$no_default}" local default_country="${2:-$no_default}" @@ -111,8 +111,9 @@ dialog_country_select() ' | sort ) f_dialog_title "Regdomain selection" + prompt="Select your regdomain." f_dialog_menu_size height width rows "$DIALOG_TITLE" \ - "$DIALOG_BACKTITLE" "Select your regdomain." "" $regdomains + "$DIALOG_BACKTITLE" "$prompt" "" $regdomains regdomain=$( sh -c "$DIALOG \ --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ @@ -120,20 +121,21 @@ dialog_country_select() --default-item \"$default_regdomain\" \ --no-items \ --stdout \ - --menu \"Select your regdomain.\" \ + --menu \"$prompt\" \ $height $width $rows $regdomains" ) f_dialog_title "Country selection" + prompt="Select your country." eval f_dialog_menu_size height width rows \ \"\$DIALOG_TITLE\" \"\$DIALOG_BACKTITLE\" \ - \"Select your country.\" \"\" $countries + \"\$prompt\" \"\" $countries country=$( eval $DIALOG \ --title \"\$DIALOG_TITLE\" \ --backtitle \"\$DIALOG_BACKTITLE\" \ --cancel-label \"\$msg_skip\" \ --default-item \"\$default_country\" \ - --menu \"Select your country.\" \ + --menu \"\$prompt\" \ $height $width $rows \ $countries \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD