Merge mainline

THANKS

@@ -7,3 +7,4 @@ Bryan Fink
 Tuncer Ayaz
 Ian Wilkinson
 Juan Jose Comellas for getopt.erl
+OJ Reeves

priv/shell-completion/bash/rebar

@@ -2,29 +2,34 @@
 
 _rebar()
 {
-    local cur prev opts
+    local cur prev sopts lopts cmdsnvars
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     sopts="-h -v -f -j"
-    lopts=" --help --verbose --force --jobs"
-    cmdsnvars="analyze build_plt clean compile create-app \
-                create-app create-node eunit generate \
-                int_test perf_test test \
-                case= force=1 jobs= suite= verbose=1"
+    lopts=" --help --verbose --force --jobs="
+    cmdsnvars="analyze build_plt check_plt clean compile \
+        create-app create-node eunit generate \
+        int_test perf_test test \
+        case= force=1 jobs= suite= verbose=1"
 
     if [[ ${cur} == --* ]] ; then
         COMPREPLY=( $(compgen -W "${lopts}" -- ${cur}) )
-        return 0
     elif [[ ${cur} == -* ]] ; then
         COMPREPLY=( $(compgen -W "${sopts}" -- ${cur}) )
-        return 0
     else
         COMPREPLY=( $(compgen -W "${cmdsnvars}" -- ${cur}) )
-        return 0
     fi
+
+    if [ -n "$COMPREPLY" ] ; then
+        # append space if matched
+        COMPREPLY="${COMPREPLY} "
+        # remove trailing space after equal sign
+        COMPREPLY=${COMPREPLY/%= /=}
+    fi
+    return 0
 }
-complete -F _rebar rebar
+complete -o nospace -F _rebar rebar
 
 # Local variables:
 # mode: shell-script