X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7c0748000784c407bc3f4b020209100341caa8e1;hb=6c33565fed35bc03f7a61fd7ecb41558cc59a988;hp=970360f14a4d87131e2881b4957f79e583f6c62a;hpb=76019aa33391b30782d3ffda6b130cbf23eaebd9;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 970360f..7c07480 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
 
@@ -68,7 +96,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/"; }
@@ -111,6 +139,13 @@ include()
 
 
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -171,24 +206,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)
-         TMUX_SAVE_TERM="$TERM"
-         TERM=rxvt-unicode
+         TERM=rxvt-unicode command tmux "$@"
       ;;
-   esac
-
-   command tmux "$@"
-   rc=$?
 
-   [ -n "$TMUX_SAVE_TERM" ] && TERM="$TMUX_SAVE_TERM"
-   unset TMUX_SAVE_TERM
-   return $rc
+      *)
+         command tmux "$@"
+      ;;
+   esac
 }