Merge pull request #775 from scop/feat/looks-like-path

feat(_comp_looks_like_path): new utility, use it

Author: scop

bash_completion

@@ -390,6 +390,14 @@ _comp_expand_glob()
     return 0
 }
 
+# Check if the argument looks like a path.
+# @param $1 thing to check
+# @return True (0) if it does, False (> 0) otherwise
+_comp_looks_like_path()
+{
+    [[ ${1-} == @(*/|[.~])* ]]
+}
+
 # Reassemble command line words, excluding specified characters from the
 # list of word completion separators (COMP_WORDBREAKS).
 # @param $1 chars  Characters out of $COMP_WORDBREAKS which should

completions/apt-get

@@ -39,7 +39,7 @@ _apt_get()
                     awk '$1 == "Source:" { print $2 }' | sort -u)" -- "$cur"))
                 ;;
             install | reinstall)
-                if [[ $cur == */* ]]; then
+                if _comp_looks_like_path "$cur"; then
                     _filedir deb
                     return
                 elif [[ $cur == *=* ]]; then
@@ -58,7 +58,7 @@ _apt_get()
                 ;;&
             build-dep)
                 _filedir -d
-                [[ $cur != */* ]] || return
+                _comp_looks_like_path "$cur" && return
                 ;;&
             *)
                 COMPREPLY+=($(_comp_xfunc apt-cache packages))

completions/gdb

@@ -17,7 +17,7 @@ _gdb()
     if ((cword == 1)); then
         local IFS
         compopt -o filenames
-        if [[ $cur == */* ]]; then
+        if _comp_looks_like_path "$cur"; then
             # compgen -c works as expected if $cur contains any slashes.
             IFS=$'\n'
             COMPREPLY=($(PATH="$PATH:." compgen -d -c -- "$cur"))

completions/kldload

@@ -7,7 +7,7 @@ _kldload()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == */* ]]; then
+    if _comp_looks_like_path "$cur"; then
         _filedir ko
         return
     fi

completions/man

@@ -52,7 +52,7 @@ _man()
     fi
 
     # file based completion if parameter looks like a path
-    if [[ $cur == @(*/|[.~])* ]]; then
+    if _comp_looks_like_path "$cur"; then
         _filedir "$manext"
         return
     fi

completions/pydoc

@@ -24,7 +24,7 @@ _pydoc()
 
     COMPREPLY=($(compgen -W 'keywords topics modules' -- "$cur"))
 
-    if [[ $cur != @(.|*/)* ]]; then
+    if ! _comp_looks_like_path "$cur"; then
         local python=python
         [[ ${1##*/} == *3* ]] && python=python3
         _comp_xfunc python modules $python

completions/pylint

@@ -107,7 +107,7 @@ _pylint()
         return
     fi
 
-    [[ $cur == @(.|*/)* ]] || _comp_xfunc python modules $python
+    _comp_looks_like_path "$cur" || _comp_xfunc python modules $python
     _filedir py
 } &&
     complete -F _pylint pylint pylint-2 pylint-3

completions/removepkg

@@ -9,7 +9,7 @@ _removepkg()
         return
     fi
 
-    if [[ $cur == */* ]]; then
+    if _comp_looks_like_path "$cur"; then
         _filedir
         return
     fi

completions/rpm

@@ -92,7 +92,7 @@ _rpm()
             ;;
         --whatenhances | --whatprovides | --whatrecommends | --whatrequires | \
             --whatsuggests | --whatsupplements)
-            if [[ $cur == */* ]]; then
+            if _comp_looks_like_path "$cur"; then
                 _filedir
             else
                 # complete on capabilities

completions/ssh

@@ -580,12 +580,11 @@ _scp()
                 COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */* | [.~]*)
-                # not a known host, pass through
-                ;;
             *)
-                _known_hosts_real ${ipvx-} -c -a \
-                    ${configfile:+-F "$configfile"} -- "$cur"
+                if ! _comp_looks_like_path "$cur"; then
+                    _known_hosts_real ${ipvx-} -c -a \
+                        ${configfile:+-F "$configfile"} -- "$cur"
+                fi
                 ;;
         esac
     fi