X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=b6c98926e00b4d9aa8f9af5ec8f02d18ece36831;hb=6a3870ac7620452291752f553af73d9eb9a690a7;hp=670a9a2cbbd3bc05987f09a12594a6ca5035e7ea;hpb=f46bd4d41cc7f243bc8a321effee5200aa69e709;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 670a9a2..b6c9892 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 \
-      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 \
@@ -58,13 +75,13 @@ esac
 #PWd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)/...\/\2/"; }
 
 
-psg()  { ps auxw   | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
-pswg() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
+psg()   { ps auxw   | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
+pswg()  { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
 
 # Like pgrep -f
 pidOf() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; }
 
-# A kind of pkill
+# A kind of pkill/killall
 KillAll() {
    if [ -z "$2" ]; then
       kill `pidOf "$1"`
@@ -136,15 +153,13 @@ mc() {
             mc_type="`mc_type.py $mc`"
             if [ "$mc_type" = old ]; then
                $mc -P $MC_SLOW $MC_XTERM "$@" > "$MC_PWD_FILE"
-               rc=$?
-               MC_FOUND=YES
             elif [ "$mc_type" = new ]; then
                $mc -P "$MC_PWD_FILE" $MC_SLOW $MC_XTERM "$@"
-               rc=$?
-               MC_FOUND=YES
             else
                continue
             fi
+            rc=$?
+            MC_FOUND=YES
             cd "`cat \"$MC_PWD_FILE\"`" && /bin/rm "$MC_PWD_FILE"
             break
          fi