From owner-svn-src-head@freebsd.org  Tue Dec 13 00:27:57 2016
Return-Path: <owner-svn-src-head@freebsd.org>
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 CF288C739EC;
 Tue, 13 Dec 2016 00:27:57 +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 9EB2C3C8;
 Tue, 13 Dec 2016 00:27:57 +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 uBD0Ru3g014036;
 Tue, 13 Dec 2016 00:27:56 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBD0Rub9014035;
 Tue, 13 Dec 2016 00:27:56 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201612130027.uBD0Rub9014035@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: Tue, 13 Dec 2016 00:27:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309962 - 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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2016 00:27:57 -0000

Author: dteske
Date: Tue Dec 13 00:27:56 2016
New Revision: 309962
URL: https://svnweb.freebsd.org/changeset/base/309962

Log:
  More efficiently make use of the exit status

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

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 00:22:01 2016	(r309961)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 00:27:56 2016	(r309962)
@@ -67,12 +67,8 @@ country_set()
 			--no-label Ignore \
 			--yesno \
 			"Error while applying chosen settings ($error_str)" \
-			0 0
-		if [ $? -eq $DIALOG_OK ]; then
-			return $FAILURE # Restart
-		else
-			return $SUCCESS # Skip
-		fi
+			0 0 || return $SUCCESS # Skip
+		return $FAILURE # Restart
 	else
 		awk 'sub(/^\t\t/,"")||1' \
 			> "$BSDINSTALL_TMPETC/rc.conf.net.wlan" <<-EOF