[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 4ec77ce531525595d9acbe01d02064445da3e8c8

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 4ec77ce531525595d9acbe01d02064445da3e8c8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 3 23:56:40 2010 +0200

    awk usage portability fixes.
    
    Some versions of Solaris awk don't like a space between -F and the
    separator char (and the char really must be a char, it can't be an
    ERE, but that's something for another patch).

diff --git a/CHANGES b/CHANGES
index d739038..b6e598a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -45,7 +45,7 @@ bash-completion (2.x)
     input in external command arguments (Debian: 552631).
   * Add /sbin to $PATH when invoking ifconfig and iwconfig.
   * Combine dcop and qdbus completions into the latter.
-  * sed usage portability fixes.
+  * awk and sed usage portability fixes.
   * Fix leaking local variables from various completions.
   * Turn on -o filenames in _filedir on bash >= 4.
   * Deprecate modules completion, upstream modules >= 3.2.7 ships one.
diff --git a/contrib/heimdal b/contrib/heimdal
index 5c81f81..9e3d181 100644
--- a/contrib/heimdal
+++ b/contrib/heimdal
@@ -12,7 +12,7 @@ _heimdal_realms()
 {
 
     COMPREPLY=( $( compgen -W "( kadmin -l dump 2>/dev/null | \
-        awk '{print $1}' | awk -F @ '{print $2}' )" -- "$cur" ) )
+        awk '{print $1}' | awk -F@ '{print $2}' )" -- "$cur" ) )
 }
 
 _heimdal_encodings()
diff --git a/contrib/wireless-tools b/contrib/wireless-tools
index 69a1583..d1bae79 100644
--- a/contrib/wireless-tools
+++ b/contrib/wireless-tools
@@ -23,7 +23,7 @@ _iwconfig()
             if [ -n "${COMP_IWLIST_SCAN:-}" ]; then
                 COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
                     "$( iwlist ${COMP_WORDS[1]} scan | \
-                    awk -F '\"' '/ESSID/ {print $2}' )" -- "$cur" ) )
+                    awk -F'\"' '/ESSID/ {print $2}' )" -- "$cur" ) )
             fi
             return 0
             ;;

-- 
bash-completion