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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'completions/sh')

diff --git a/completions/sh b/completions/sh
index 5624ffa..5581bcc 100644
--- a/completions/sh
+++ b/completions/sh
@@ -1,36 +1,35 @@
 # POSIX sh(1) completion                                   -*- shell-script -*-
 
-_sh()
+_comp_cmd_sh()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         -c)
             return
             ;;
         -o | +o)
-            COMPREPLY=($(compgen -W 'allexport errexit ignoreeof monitor
-                noclobber noglob noexec nolog notify nounset verbose vi
-                xtrace' -- "$cur"))
+            _comp_compgen -- -W 'allexport errexit ignoreeof monitor noclobber
+                noglob noexec nolog notify nounset verbose vi xtrace'
             return
             ;;
     esac
 
     local opts="-a -b -C -e -f -h -i -m -n -o -u -v -x"
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W "$opts -c -s" -- "$cur"))
+        _comp_compgen -- -W "$opts -c -s"
         return
     elif [[ $cur == +* ]]; then
-        COMPREPLY=($(compgen -W "${opts//-/+}" -- "$cur"))
+        _comp_compgen -- -W "${opts//-/+}"
         return
     fi
 
-    local args ext=
-    _count_args "" "@(-c|[-+]o)"
-    ((args == 1)) && ext="sh"
-    _filedir $ext
+    local REPLY ext=
+    _comp_count_args -a "@(-c|[-+]o)"
+    ((REPLY == 1)) && ext="sh"
+    _comp_compgen_filedir $ext
 } &&
-    complete -F _sh sh
+    complete -F _comp_cmd_sh sh
 
 # ex: filetype=sh
-- 
cgit v1.2.3