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

diff --git a/.shellrc b/.shellrc
index 670a9a2..e70784b 100644
--- a/.shellrc
+++ b/.shellrc
@@ -6,6 +6,17 @@ OPS1="$OPS1\\$"
 PS1="$OPS1 "
 
 
+case "$HOME" in
+   /home/*)
+      if [ -L /home ]; then
+         START_DIR="`pwd`" &&
+         cd "$HOME" &&
+         HOME="`pwd`" &&
+         cd "$START_DIR"
+      fi
+   ;;
+esac
+
 case "$SHELL" in
 */bash)
    [ "`type -t ls`" = alias ] && unalias ls
@@ -17,18 +28,52 @@ 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
-      complete -A command -o default man
+      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
+
+   has_completion() { return 0; }
+   if [ "$SHELL" = /bin/bash ]; then
+      if [ -d /etc/bash_completion.d -o -d /usr/share/bash-completion/completions ]; then
+         has_completion() { [ -r /etc/bash_completion.d/$1 -o -r /usr/share/bash-completion/completions/$1 ]; }
+      fi
+   elif [ "$SHELL" = /usr/local/bin/bash ]; then
+      if [ -d /usr/local/etc/bash_completion.d ]; then
+         has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
+      fi
    fi
-   complete -A hostname dig host nslookup nc netcat nmap p ping ping6 socat \
+
+   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
+         ! has_completion $cmd && complete -o default -A command $cmd
+   done
+
+   for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \
       telnet t tt \
       tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
-      whois wget wget-m wget-wrapper ww
-   complete -A hostname -o default distribute ftp lftp r rsync \
-      s scp ssh smbclient tcpdump tshark wireshark
+      whois wget wget-m wget-wrapper ww; do
+         ! has_completion $cmd && complete -A hostname $cmd
+   done
+
+   for cmd in distribute ftp lftp r rsync \
+      s scp ssh smbclient tcpdump tshark wireshark; do
+         ! has_completion $cmd && complete -o default -A hostname $cmd;
+   done
+   unset has_completion
+
    complete -A job bg fg j jobs wait
    complete -A variable unset
 
@@ -36,6 +81,8 @@ case "$SHELL" in
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
+
+   which pip >/dev/null 2>&1 && eval "`pip completion --bash`"
    ;;
 
 */ksh)
@@ -51,20 +98,20 @@ esac
 
 
 # clear history, clear screen and logout
-#chlo() { cd; unset HISTFILE; rm -f .*history*; clo; }
+#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clo; }
 
 
 #Pwd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)\/\(.*\)\/\(.*\)/...\/\2\/\3\/\4/"; }
 #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"`
@@ -94,6 +141,13 @@ include()
 
 
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -136,15 +190,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
@@ -156,7 +208,36 @@ mc() {
       rc=1
    fi
 
+   [ -n "$MC_SAVE_OPS1" ] && OPS1="$MC_SAVE_OPS1"
    [ -n "$MC_SAVE_TERM" ] && TERM="$MC_SAVE_TERM"
-   unset MC_FOUND MC_PWD_FILE MC_SAVE_TERM MC_SLOW MC_TMP_DIR MC_XTERM
+   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SAVE_TERM \
+         MC_SLOW MC_TMP_DIR MC_XTERM
+
    return $rc
 }
+
+
+mkcd() {
+   if [ $# -ne 1 ]; then
+      echo "Usage: mkcd directory_name" >&2
+   elif [ -d "$1" ]; then
+      cd "$1"
+   elif [ -e "$1" ]; then
+      echo "Error: $1 is a file" >&2
+   else
+      mkdir -p "$1" && cd "$1"
+   fi
+}
+
+
+tmux() {
+   case "$TERM" in
+      rxvt)
+         TERM=rxvt-unicode command tmux "$@"
+      ;;
+
+      *)
+         command tmux "$@"
+      ;;
+   esac
+}