.shellrc: Do not check `$SHELL`, just check for files

diff --git a/.shellrc b/.shellrc
index 4fc1021a2001733f22124f472a3bcb7ccc522bfe..8876507d44808c5d1e554b77df5f1449df804c28 100644 (file)
--- 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
 
    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 ]; }
+      elif [ -r /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 ]; }
+      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 ]; }

       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi