X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=0549c17a705e5ea004ccb4a3acd4e7fcff99d821;hb=0c99131807db3cfbd340fdfe9e9c3737c971b5cc;hp=38d9dcc2f54b85d95f335dde0141979497a402d8;hpb=171941f5107d46317e3487d611e60c59054b7782;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 38d9dcc..0549c17 100644
--- a/.shellrc
+++ b/.shellrc
@@ -68,26 +68,22 @@ if test -n "$BASH_VERSION"; then
 
    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
+         . /usr/share/bash-completion/bash_completion
+         has_completion() { [ -r /usr/share/bash-completion/completions/$1 -o -n "complete -p $1 2>/dev/null" ]; }
+      elif [ -r /etc/bash_completion ]; then
+         . /etc/bash_completion
+         has_completion() { [ -r /etc/bash_completion.d/$1 -o -n "complete -p $1 2>/dev/null" ]; }
+      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 -o -n "complete -p $1 2>/dev/null" ]; }
+      elif [ -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 -o -n "complete -p $1 2>/dev/null" ]; }
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
@@ -95,7 +91,7 @@ if test -n "$BASH_VERSION"; then
 
    for cmd in builtin cgmem_nice command dbus-launch exec \
          killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
-         su sudo time whence whereis which xargs; do
+         run-all-hosts su sudo time whence whereis which xargs; do
       ! has_completion $cmd && complete -o default -A command $cmd
    done