fix(_filedir): apply trailing slashes with -f

If we are completing entries somewhere else besides the current dir,
`compopt -o filenames` won't do its usual thing; append slashes
ourselves.

Co-authored-by: Koichi Murase <myoga.murase@gmail.com>

Author: scop

bash_completion

@@ -1057,9 +1057,12 @@ _comp_quote_compgen()
 
 # This function performs file and directory completion. It's better than
 # simply using 'compgen -f', because it honours spaces in filenames.
-# @param $1  If `-d', complete only on directories.  Otherwise filter/pick only
-#            completions with `.$1' and the uppercase version of it as file
-#            extension.
+# @param $1 Complete filenames matching `.$1' and the uppercase version of it.
+#           Ignored with `-d`.
+# OPTIONS
+#   -d      Complete only on directories
+#   -f      Perform `compopt -f filenames` modifications manually.  This suffix
+#           a slash to a directory name.
 # @return 0 if at least one completion is generated, or 1 otherwise.
 #
 # @since 2.12
@@ -1068,9 +1071,22 @@ _comp_compgen_filedir()
     _comp_compgen_tilde && return
 
     local -a toks
+    local _dir="" _filenames=""
+    local OPTIND=1 OPTARG="" OPTERR=0 _opt
+    while getopts ":df" _opt "$@"; do
+        case $_opt in
+            d) _dir=set ;;
+            f) _filenames=set ;;
+            *)
+                printf "bash_completion: %s: usage error\n" "$FUNCNAME" >&2
+                return 2
+                ;;
+        esac
+    done
+    shift "$((OPTIND - 1))"
     local _arg=${1-}
 
-    if [[ $_arg == -d ]]; then
+    if [[ $_dir ]]; then
         _comp_compgen -v toks -- -d
     else
         local REPLY
@@ -1106,9 +1122,19 @@ _comp_compgen_filedir()
     fi
 
     if ((${#toks[@]} != 0)); then
-        # 2>/dev/null for direct invocation, e.g. in the _comp_compgen_filedir
-        # unit test
-        compopt -o filenames 2>/dev/null
+        # compopt 2>/dev/null for direct invocation, e.g. in
+        # _comp_compgen_filedir unit test
+        if [[ $_filenames ]]; then
+            local i
+            for i in "${!toks[@]}"; do
+                if [[ -d ${toks[i]} ]]; then
+                    toks[i]+=/
+                    compopt -o nospace 2>/dev/null
+                fi
+            done
+        else
+            compopt -o filenames 2>/dev/null
+        fi
     fi
 
     # Note: bash < 4.4 has a bug that all the elements are connected with

completions/_mount.linux

@@ -38,11 +38,11 @@ _comp_cmd_mount()
             return
             ;;
         -L)
-            _comp_compgen -C "/dev/disk/by-label/" -- -f
+            _comp_compgen -C "/dev/disk/by-label/" filedir -f
             return
             ;;
         -U)
-            _comp_compgen -C "/dev/disk/by-uuid/" -- -f
+            _comp_compgen -C "/dev/disk/by-uuid/" filedir -f
             return
             ;;
         -O | --test-opts)

completions/_slackpkg

@@ -65,16 +65,16 @@ _comp_cmd_slackpkg()
             ;;
         install-template | remove-template)
             if [[ -e $confdir/templates ]]; then
-                _comp_compgen -C "$confdir/templates" -- -f -X \
-                    "!?*.template" && COMPREPLY=("${COMPREPLY[@]%.template}")
+                _comp_compgen -C "$confdir/templates" filedir -f template &&
+                    COMPREPLY=("${COMPREPLY[@]%.template}")
             fi
             return
             ;;
         remove)
             _comp_compgen_filedir
             _comp_compgen -a -- -W 'a ap d e f k kde kdei l n t tcl x xap xfce
                 y'
-            _comp_compgen -aC /var/log/packages -- -f
+            _comp_compgen -aC /var/log/packages filedir -f
             return
             ;;
         install | reinstall | upgrade | blacklist | download)

completions/removepkg

@@ -15,7 +15,7 @@ _comp_cmd_removepkg()
     fi
 
     local root=${ROOT:-/}
-    _comp_compgen -C "$root/var/log/packages" -- -f
+    _comp_compgen -C "$root/var/log/packages" filedir -f
 } &&
     complete -F _comp_cmd_removepkg removepkg
 

completions/sbopkg

@@ -65,7 +65,7 @@ _comp_cmd_sbopkg()
         command sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p;}" \
             "$file"
     ))
-    _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
+    _comp_compgen -aC "$QUEUEDIR" filedir -f sqf
 } &&
     complete -F _comp_cmd_sbopkg sbopkg
 

completions/slapt-get

@@ -70,7 +70,7 @@ _comp_cmd_slapt_get()
             return
             ;;
         ins) # --remove|--filelist
-            _comp_compgen -C /var/log/packages -- -f
+            _comp_compgen -C /var/log/packages filedir -f
             return
             ;;
         set) # --install-set