bash-completion: Localize variables, use more consistent variable names

diff --git a/notmuch-completion.bash b/notmuch-completion.bash
index ff0a24d60cbfe5f095ba41dfdd6a07e270db2b86..fc2d13c1e1cd3f780ad9c3cc1891385c54275d28 100644 (file)
--- a/notmuch-completion.bash
+++ b/notmuch-completion.bash
@@ -43,20 +43,21 @@
 
 _notmuch()
 {
 
 _notmuch()
 {

-    current="$2"
+    local current previous commands help_options

 
 

-    commands="setup new search show reply tag dump restore help"
+    previous=${COMP_WORDS[COMP_CWORD-1]}
+    current="${COMP_WORDS[COMP_CWORD]}"

 
 

+    commands="setup new search show reply tag dump restore help"

     help_options="setup new search show reply tag dump restore search-terms"
 
     COMPREPLY=()
     help_options="setup new search show reply tag dump restore search-terms"
 
     COMPREPLY=()

-    prev=${COMP_WORDS[COMP_CWORD-1]}

 
     if [[ "$COMP_CWORD" == "1" ]]; then
         COMPREPLY=( $(compgen -W "${commands}" -- ${current}) )
     fi
 
 
     if [[ "$COMP_CWORD" == "1" ]]; then
         COMPREPLY=( $(compgen -W "${commands}" -- ${current}) )
     fi
 

-    if [[ $prev = "help" && "$COMP_CWORD" == "2" ]]; then
+    if [[ $previous = "help" && "$COMP_CWORD" == "2" ]]; then

         COMPREPLY=( $(compgen -W "${help_options}" -- ${current}) )
     fi
 }
         COMPREPLY=( $(compgen -W "${help_options}" -- ${current}) )
     fi
 }