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

diff --git a/.shellrc b/.shellrc
index 2ef0bdb..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
@@ -33,19 +44,36 @@ case "$SHELL" in
       fi
    fi
 
-   if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-      complete -A command -o default man
+   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 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 \
+   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
 
@@ -53,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)
@@ -68,7 +98,7 @@ 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/"; }
@@ -81,7 +111,7 @@ 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"`
@@ -111,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
@@ -171,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
+}