Updated ChangeLog for release 5

[brew-completion.git] / brew-completion.sh

diff --git a/brew-completion.sh b/brew-completion.sh
index f05a585809bc70c5775f4c2f87a17d80f5838641..ee3a7c5764eb02641f96ce6cd43a14fa94315bd4 100644 (file)
--- a/brew-completion.sh
+++ b/brew-completion.sh
@@ -30,9 +30,17 @@ _brew()
        prev=${COMP_WORDS[COMP_CWORD-1]}
        cmd=""
 
+       # Get list of all available external commands
+       EXTCMD=`cd /usr/local/bin; ls -1 brew-* | cut -d'.' -f1 \
+               | cut -d'-' -f2- | sed -e 's/\*//g'`
+
        declare -i i=$COMP_CWORD-1
        while [ $i -gt 0 ]; do
-               if [[ ${COMP_WORDS[i]} != -* ]]; then
+               if [[ ${COMP_WORDS[i]} != -* \
+                  || ${COMP_WORDS[i]} == "--cache" \
+                  || ${COMP_WORDS[i]} == "--cellar" \
+                  || ${COMP_WORDS[i]} == "--config" \
+                  || ${COMP_WORDS[i]} == "--prefix" ]]; then
                        cmd=${COMP_WORDS[i]}
                        break
                fi
@@ -40,24 +48,25 @@ _brew()
        done
 
        case "$cmd" in
-               "cleanup"|"edit"|"home"|"log"|"prune")
+               "cat"|"cleanup"|"deps"|"edit"|"home"|"log"|"prune"|"uses" \
+               |"--cache"|"--cellar"|"--prefix")
                        _brew_formula "$cur"
                        return 0
                        ;;
-               "link"|"remove"|"uninstall"|"unlink")
+               "link"|"remove"|"rm"|"uninstall"|"unlink")
                        _brew_formula_installed "$cur"
                        return 0
                        ;;
                "create")
                        if [[ "$cur" == -* ]]; then
-                               COMPREPLY=( $(compgen -W '--macports' \
-                                       -- "$cur") )
+                               COMPREPLY=( $(compgen -W '--macports --fink \
+                                       --cache' -- "$cur") )
                        fi
                        return 0
                        ;;
                "info")
                        if [[ "$cur" == -* ]]; then
-                               COMPREPLY=( $(compgen -W '--github' \
+                               COMPREPLY=( $(compgen -W '--all --github' \
                                        -- "$cur") )
                        else
                                _brew_formula "$cur"
@@ -66,7 +75,7 @@ _brew()
                        ;;
                "install")
                        if [[ "$cur" == -* ]]; then
-                               COMPREPLY=( $(compgen -W '--HEAD -H \
+                               COMPREPLY=( $(compgen -W '--git --HEAD -H \
                                        --debug -d --interactive -i
                                        --verbose -v --ignore-dependencies' \
                                        -- "$cur") )
@@ -84,18 +93,25 @@ _brew()
                        fi
                        return 0
                        ;;
-               "search"|"update")
-                       return 0
-                       ;;
+               *)
+                       for c in $EXTCMD; do
+                               if [ "$cmd" = "$c" ]; then
+                                       _brew_formula "$cur"
+                                       return 0
+                               fi
+                       done
        esac
 
        if [[ "$cur" == -* ]]; then
-               COMPREPLY=( $(compgen -W '--cache --cellar --help --prefix \
-                       --version -v -H' -- "$cur") )
+               COMPREPLY=( $(compgen -W '--cache --cellar --config \
+                       --help --prefix --version -v -H' \
+                       -- "$cur") )
        elif [ "$cmd" = "" ]; then
-               COMPREPLY=( $(compgen -W 'cleanup create edit home info \
-                       install link list log outdated prune remove search \
-                       uninstall unlink update' -- "$cur") )
+               COMPREPLY=( $(compgen -W 'cat cleanup create deps doctor \
+                       edit home info install link list log outdated prune \
+                       remove rm search uninstall unlink up update uses \
+                       $EXTCMD' \
+                       -- "$cur") )
        fi
 }
 complete -F _brew brew