From f2621414ee5f2f601424c22f00e207903e3b6104 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:03:18 +0200
Subject: Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/_chsh | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'completions/_chsh')

diff --git a/completions/_chsh b/completions/_chsh
index 8f8a807..4e243ba 100644
--- a/completions/_chsh
+++ b/completions/_chsh
@@ -1,31 +1,43 @@
 # chsh(1) completion                                       -*- shell-script -*-
 
-# Use of this file is deprecated on Linux.  Upstream completion is
-# available in util-linux >= 2.23, use that instead.
+# Use of this file is deprecated on Linux systems whose chsh is from
+# util-linux. Upstream completion is in util-linux >= 2.23, use that instead.
 
-_chsh()
+_comp_cmd_chsh()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
+
+    local word chroot="" has_chroot=""
+    for word in "${words[@]}"; do
+        if [[ $has_chroot ]]; then
+            chroot=$word
+            break
+        fi
+        [[ $word != -@(R|-root) ]] || has_chroot=set
+    done
 
     case $prev in
         --list-shells | --help | -v | --version)
             return
             ;;
+        -R | --root)
+            _comp_compgen_filedir -d
+            return
+            ;;
         -s | --shell)
-            _shells
+            _comp_compgen_shells "${chroot-}"
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        local opts=$(_parse_help "$1")
-        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        _comp_compgen_help || _comp_compgen_usage
     else
-        _allowed_users
+        _comp_compgen_allowed_users
     fi
 
 } &&
-    complete -F _chsh chsh
+    complete -F _comp_cmd_chsh chsh
 
 # ex: filetype=sh
-- 
cgit v1.2.3