From owner-svn-src-all@freebsd.org Mon Dec 12 18:39:27 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 B6942C722F6; Mon, 12 Dec 2016 18:39:27 +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 860E51A16; Mon, 12 Dec 2016 18:39:27 +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 uBCIdQJu069449; Mon, 12 Dec 2016 18:39:26 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBCIdQoB069448; Mon, 12 Dec 2016 18:39:26 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201612121839.uBCIdQoB069448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Mon, 12 Dec 2016 18:39:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309914 - 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: Mon, 12 Dec 2016 18:39:27 -0000 Author: dteske Date: Mon Dec 12 18:39:26 2016 New Revision: 309914 URL: https://svnweb.freebsd.org/changeset/base/309914 Log: Add missing `-e' parameter to sed invocations Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 18:38:18 2016 (r309913) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 18:39:26 2016 (r309914) @@ -52,7 +52,7 @@ country_set() iface_up=$( ifconfig -lu | grep -w $WLAN_IFACE ) [ "$iface_up" ] && ifconfig $WLAN_IFACE down error_str=$( ifconfig $WLAN_IFACE $ifconfig_args 2>&1 | - sed 's/ifconfig: //' ) + sed -e 's/ifconfig: //' ) if [ "$iface_up" ]; then # Restart wpa_supplicant(8) (should not fail). wpa_supplicant -B -i $WLAN_IFACE -c \ @@ -85,11 +85,11 @@ dialog_country_select() # # Parse available countries/regdomains # - input=$( ifconfig $WLAN_IFACE list countries | sed 's/DEBUG//gi' ) - regdomains=$( echo $input | sed 's/.*domains://' | tr ' ' '\n' | + input=$( ifconfig $WLAN_IFACE list countries | sed -e 's/DEBUG//gi' ) + regdomains=$( echo $input | sed -e 's/.*domains://' | tr ' ' '\n' | sort | tr '\n' ' ' ) - countries=$( echo $input | sed 's/Country codes://' | - sed 's/Regulatory.*//' | awk '{ + countries=$( echo $input | sed -e 's/Country codes://' | + sed -e 's/Regulatory.*//' | awk '{ for (i = 1; i <= NF; i++) { printf "%s", $i if (match($i, "[[:lower:]]"))