refactor: rename { => _comp_compgen}_shells

Author: akinomyoga

bash_completion

@@ -2094,15 +2094,17 @@ _comp_selinux_users()
 }
 
 # This function completes on valid shells
-#
 # @param $1 chroot to search from
-# TODO:API: rename per conventions
-_shells()
+#
+# @since 2.12
+_comp_compgen_shells()
 {
-    local shell rest
-    while read -r shell rest; do
-        [[ $shell == /* && $shell == "$cur"* ]] && COMPREPLY+=("$shell")
+    local -a shells=()
+    local _shell _rest
+    while read -r _shell _rest; do
+        [[ $_shell == /* ]] && shells+=("$_shell")
     done 2>/dev/null <"${1-}"/etc/shells
+    _comp_compgen -U shells -- -W '"${shells[@]}"'
 }
 
 # This function completes on valid filesystem types

bash_completion.d/000_bash_completion_compat.bash

@@ -414,6 +414,12 @@ _allowed_groups()
     _comp_compgen -c "${1:-$cur}" allowed_groups
 }
 
+# @deprecated 2.12 Use `_comp_compgen -a shells`
+_shells()
+{
+    _comp_compgen -a shells
+}
+
 # @deprecated 2.12 Use `_comp_compgen -a fstypes`
 _fstypes()
 {

completions/_chsh

@@ -26,7 +26,7 @@ _comp_cmd_chsh()
             return
             ;;
         -s | --shell)
-            _shells "${chroot-}"
+            _comp_compgen_shells "${chroot-}"
             return
             ;;
     esac

completions/_su

@@ -15,7 +15,7 @@ _comp_cmd_su()
 
     case "$prev" in
         -s | --shell)
-            _shells
+            _comp_compgen_shells
             return
             ;;
         -c | --command | --session-command)

completions/luseradd

@@ -18,7 +18,7 @@ _comp_cmd_luseradd()
             return
             ;;
         --shell | -${noargopts}s)
-            _shells
+            _comp_compgen_shells
             return
             ;;
         --gid | -${noargopts}g)

completions/mussh

@@ -30,7 +30,7 @@ _comp_cmd_mussh()
             return
             ;;
         -s)
-            _shells
+            _comp_compgen_shells
             return
             ;;
         -p | -h)

completions/screen

@@ -96,7 +96,7 @@ _comp_cmd_screen__sessions()
                 return
                 ;;
             -*s)
-                _shells
+                _comp_compgen_shells
                 return
                 ;;
             -*c)

completions/useradd

@@ -42,7 +42,7 @@ _comp_cmd_useradd()
             return
             ;;
         --shell | -${noargopts}s)
-            _shells "${chroot-}"
+            _comp_compgen_shells "${chroot-}"
             return
             ;;
     esac

completions/usermod

@@ -42,7 +42,7 @@ _comp_cmd_usermod()
             return
             ;;
         --shell | -${noargopts}s)
-            _shells "${chroot-}"
+            _comp_compgen_shells "${chroot-}"
             return
             ;;
     esac