Merge pull request #1297 from akinomyoga/compgen-cwd

fix(_umount,feh,sbopkg): check diretory name for `_comp_compgen -C`

Author: akinomyoga

completions/_umount.linux

@@ -72,7 +72,7 @@ _comp_cmd_umount__linux_fstab()
             realcur="$(readlink -f "$cur." 2>/dev/null)/" ||
             realcur=$(readlink -f "$cur" 2>/dev/null)
         if [[ $realcur ]]; then
-            local dirrealcur="" dircur="" basecur
+            local dirrealcur="" dircur=. basecur
             if [[ $cur == */* ]]; then
                 dirrealcur="${realcur%/*}/"
                 dircur="${cur%/*}/"

completions/feh

@@ -30,11 +30,13 @@ _comp_cmd_feh()
             local font_path
             # font_path="$(imlib2-config --prefix 2>/dev/null)/share/imlib2/data/fonts"
             # _comp_compgen -C "$font_path" -- -f -X "!*.@([tT][tT][fF])" -S /
-            for ((i = ${#words[@]} - 1; i > 0; i--)); do
+            for ((i = ${#words[@]} - 2; i > 0; i--)); do
                 if [[ ${words[i]} == -@(C|-fontpath) ]]; then
                     font_path="${words[i + 1]}"
-                    _comp_compgen -aC "$font_path" -- \
-                        -f -X "!*.@([tT][tT][fF])" -S /
+                    if [[ -d $font_path ]]; then
+                        _comp_compgen -aC "$font_path" -- \
+                            -f -X "!*.@([tT][tT][fF])" -S /
+                    fi
                 fi
             done
             compopt -o nospace

completions/sbopkg

@@ -63,7 +63,9 @@ _comp_cmd_sbopkg()
 
     _comp_compgen_split -l -- "$(command sed -ne "s/^SLACKBUILD NAME: //p" \
         "$file")"
-    _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
+    if [[ -d ${QUEUEDIR-} ]]; then
+        _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
+    fi
 } &&
     complete -F _comp_cmd_sbopkg sbopkg