Date: Mon, 12 Dec 2016 18:39:26 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309914 - head/usr.sbin/bsdinstall/scripts Message-ID: <201612121839.uBCIdQoB069448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:]]"))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612121839.uBCIdQoB069448>