From owner-svn-src-all@freebsd.org  Mon Dec 12 19:07:43 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 C0214C72FEA;
 Mon, 12 Dec 2016 19:07:43 +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 8F90718F0;
 Mon, 12 Dec 2016 19:07:43 +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 uBCJ7gjk081583;
 Mon, 12 Dec 2016 19:07:42 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBCJ7gwk081582;
 Mon, 12 Dec 2016 19:07:42 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201612121907.uBCJ7gwk081582@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 12 Dec 2016 19:07:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309923 - 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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Dec 2016 19:07:43 -0000

Author: dteske
Date: Mon Dec 12 19:07:42 2016
New Revision: 309923
URL: https://svnweb.freebsd.org/changeset/base/309923

Log:
  There is zero harm in always passing --default-item to dialog

Modified:
  head/usr.sbin/bsdinstall/scripts/wlanconfig

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Mon Dec 12 19:01:04 2016	(r309922)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Mon Dec 12 19:07:42 2016	(r309923)
@@ -80,8 +80,9 @@ country_set()
 dialog_country_select()
 {
 	local input regdomains countries regdomain country
-	local def_item_regdomain=
-	local def_item_country=
+	local no_default="<not selected>"
+	local def_item_regdomain="${1:-$no_default}"
+	local def_item_country="${2:-$no_default}"
 
 	#
 	# Parse available countries/regdomains
@@ -104,14 +105,6 @@ dialog_country_select()
 		}
 	}' | sort -k 2 | tr '\n' ' ' )
 
-	# Change default cursor position (if required).
-	if [ "$1" != "<not selected>" ]; then
-		def_item_regdomain="--default-item $1"
-	fi
-	if [ "$2" != "<not selected>" ]; then
-		def_item_country="--default-item $2"
-	fi
-
 	f_dialog_menu_size height width rows \"Regdomain selection\" \
 		\"$DIALOG_BACKTITLE\" \"Select your regdomain.\" \
 		\"\" $regdomains
@@ -119,7 +112,7 @@ dialog_country_select()
 		--backtitle \"$DIALOG_BACKTITLE\" \
 		--title \"Regdomain selection\" \
 		--cancel-label \"Skip\" \
-		$def_item_regdomain \
+		--default-item \"$def_item_regdomain\" \
 		--no-items \
 		--stdout \
 		--menu \"Select your regdomain.\" \