New upstream version 2.11upstream/2.11upstream

1 files changed, 19 insertions, 17 deletions

diff --git a/completions/update-alternatives b/completions/update-alternatives
index 17b687a7..25d2ce6b 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -7,13 +7,13 @@ _installed_alternatives()
     for i in alternatives dpkg/alternatives rpm/alternatives; do
         [[ -d /var/lib/$i ]] && admindir=/var/lib/$i && break
     done
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --admindir ]]; then
-            admindir=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --admindir ]]; then
+            admindir=${words[i + 1]}
             break
         fi
     done
-    COMPREPLY=( $(compgen -W '$(command ls $admindir)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(command ls $admindir)' -- "$cur"))
 }
 
 _update_alternatives()
@@ -22,11 +22,11 @@ _update_alternatives()
     _init_completion || return
 
     case $prev in
-        --altdir|--admindir)
+        --altdir | --admindir)
             _filedir -d
             return
             ;;
-        --help|--usage|--version)
+        --help | --usage | --version)
             return
             ;;
     esac
@@ -34,18 +34,18 @@ _update_alternatives()
     local mode args i
 
     # find which mode to use and how many real args used so far
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --@(install|remove|auto|display|config|remove-all|set) ]]; then
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --@(install|remove|auto|display|config|remove-all|set) ]]; then
             mode=${words[i]}
-            args=$(($cword - i))
+            args=$((cword - i))
             break
         fi
     done
 
-    case $mode in
+    case ${mode-} in
         --install)
             case $args in
-                1|3)
+                1 | 3)
                     _filedir
                     ;;
                 2)
@@ -56,19 +56,20 @@ _update_alternatives()
                     ;;
                 *)
                     case $((args % 4)) in
-                        0|2)
+                        0 | 2)
                             _filedir
                             ;;
                         1)
-                            COMPREPLY=( $(compgen -W '--slave' -- "$cur") )
+                            COMPREPLY=($(compgen -W '--slave' -- "$cur"))
                             ;;
                         3)
                             _installed_alternatives
                             ;;
                     esac
+                    ;;
             esac
             ;;
-        --remove|--set)
+        --remove | --set)
             case $args in
                 1)
                     _installed_alternatives
@@ -78,13 +79,14 @@ _update_alternatives()
                     ;;
             esac
             ;;
-        --auto|--remove-all|--display|--config)
+        --auto | --remove-all | --display | --config)
             _installed_alternatives
             ;;
         *)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            ;;
     esac
 } &&
-complete -F _update_alternatives update-alternatives alternatives
+    complete -F _update_alternatives update-alternatives alternatives
 
 # ex: filetype=sh