From: Oleg Broytman <phd@phdru.name>
Date: Wed, 25 Jun 2014 15:57:28 +0000 (+0400)
Subject: Source bash_completion
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=516782105f9eabd3ea0dd79311b584a12e7cdbaf;p=dotfiles.git

Source bash_completion

Source [/usr/local]/etc/bash_completion.d/ if it was not automatically
sourced.
---

diff --git a/.shellrc b/.shellrc
index 9e9a47f..565347d 100644
--- a/.shellrc
+++ b/.shellrc
@@ -17,12 +17,29 @@ case "$SHELL" in
    eval 'functions() { typeset -f ${1:+"$@"}; }'
    j() { jobs; }
 
-   complete -A command -o default builtin cgmem_nice command dbus-launch exec \
-      killall nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo time \
-      whence whereis which xargs
+   if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+      if [ "$SHELL" = /bin/bash ]; then
+         if [ -f /etc/bash_completion ]; then
+            . /etc/bash_completion
+         elif [ -d /etc/bash_completion.d ]; then
+            . /etc/bash_completion.d/*
+         fi
+      elif [ "$SHELL" = /usr/local/bin/bash ]; then
+         if [ -d /usr/local/etc/bash_completion.d ]; then
+            . /usr/local/etc/bash_completion.d/*
+         fi
+      else
+         echo "Unknown OS type, canot source bash_completion" >&2
+      fi
+   fi
+
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       complete -A command -o default man
    fi
+
+   complete -A command -o default builtin cgmem_nice command dbus-launch exec \
+      killall nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo time \
+      whence whereis which xargs
    complete -A hostname dig host nslookup nc netcat nmap p ping ping6 socat \
       telnet t tt \
       tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \