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

diff --git a/.shellrc b/.shellrc
index eb741b1..7c07480 100644
--- a/.shellrc
+++ b/.shellrc
@@ -8,8 +8,7 @@ PS1="$OPS1 "
 
 case "$HOME" in
    /home/*)
-      home_link="`readlink /home`"
-      if [ -n "$home_link" ]; then
+      if [ -L /home ]; then
          START_DIR="`pwd`" &&
          cd "$HOME" &&
          HOME="`pwd`" &&
@@ -73,6 +72,7 @@ case "$SHELL" in
       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
@@ -96,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/"; }
@@ -138,20 +138,14 @@ include()
 }
 
 
-function 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
-}
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -212,12 +206,28 @@ 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)