X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=70393ad7d51d3cc77db6f10d5a66d4590bea5897;hb=fb77946f36e1fa4cfaeb4a5af00f45e28dca73af;hp=4fc1021a2001733f22124f472a3bcb7ccc522bfe;hpb=46d946faa8eba2e7bbbd24e3ff13162e8b6fa90b;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 4fc1021..70393ad 100644
--- a/.shellrc
+++ b/.shellrc
@@ -66,33 +66,33 @@ if test -n "$BASH_VERSION"; then
    functions() { typeset -f "$@"; }
    j() { jobs; }
 
-   has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-      if [ "$SHELL" = /bin/bash ]; then
-         if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then
-            . /usr/share/bash-completion/bash_completion
-            has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
-         elif [ -f /etc/bash_completion ]; then
-            . /etc/bash_completion
-            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
-         elif [ -d /etc/bash_completion.d ]; then
-            for _compf in /etc/bash_completion.d/*; do
-               . $_compf
-            done
-            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
-         fi
-      elif [ "$SHELL" = /usr/local/bin/bash ]; then
-         if [ -d /usr/local/etc/bash_completion.d ]; then
-            for _compf in /usr/local/etc/bash_completion.d/*; do
-               . $_compf
-            done
-            has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
-         fi
+      if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then
+         _BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions
+         . /usr/share/bash-completion/bash_completion
+      elif [ -r /etc/bash_completion ]; then
+         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
+         . /etc/bash_completion
+      elif [ -d /etc/bash_completion.d ]; then
+         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
+         for _compf in /etc/bash_completion.d/*; do
+            . $_compf
+         done
+      elif [ -d /usr/local/etc/bash_completion.d ]; then
+         _BASH_COMPLETIONS_DIR=/usr/local/etc/bash_completion.d
+         for _compf in /usr/local/etc/bash_completion.d/*; do
+            . $_compf
+         done
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
    fi
 
+   has_completion() {
+      [ -n "$_BASH_COMPLETIONS_DIR" -a -d "$_BASH_COMPLETIONS_DIR" -a -r "$_BASH_COMPLETIONS_DIR/$1" ] ||
+      complete -p $1 >/dev/null 2>&1
+   }
+
    for cmd in builtin cgmem_nice command dbus-launch exec \
          killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
          run-all-hosts su sudo time whence whereis which xargs; do
@@ -111,6 +111,16 @@ if test -n "$BASH_VERSION"; then
       ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
+   for cmd in bg fg jobs; do
+      ! has_completion $cmd && complete -A job $cmd
+   done
+
+   complete -A job j wait
+
+   for cmd in unset; do
+      ! has_completion $cmd && complete -A variable -A function $cmd
+   done
+
    if [ -d "$HOME"/.bash_completion.d ]; then
       for _compf in "$HOME"/.bash_completion.d/*; do
          . $_compf
@@ -120,17 +130,16 @@ if test -n "$BASH_VERSION"; then
    delegate_completion() {
       local prog programs
       prog=$1
-      if has_completion $prog; then
-         shift
-         programs="$@"
-         eval "_${prog}_completion_loader() {
-            _completion_loader $prog
-            complete -o nospace -F _$prog $programs
-            unset _${prog}_completion_loader
-            return 124
-         }"
-         complete -F _${prog}_completion_loader $programs
-      fi
+      ! has_completion $prog && return
+      shift
+      programs="$@"
+      eval "_${prog}_completion_loader() {
+         _completion_loader $prog
+         complete -o nospace -F _$prog $programs
+         unset _${prog}_completion_loader
+         return 124
+      }"
+      complete -F _${prog}_completion_loader $programs
    }
 
    delegate_completion make m
@@ -139,10 +148,7 @@ if test -n "$BASH_VERSION"; then
    delegate_completion ssh s
    delegate_completion wget wget-m wget-wrapper ww
 
-   unset has_completion delegate_completion
-
-   complete -A job bg fg j jobs wait
-   complete -A variable -A function unset
+   unset _BASH_COMPLETIONS_DIR has_completion delegate_completion
 
    if [ -d "$HOME/lib/config" ]; then
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include