X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7c0748000784c407bc3f4b020209100341caa8e1;hb=d7faba863d07e11ff41a4bb7076ffe2b24f8b42e;hp=e189ac8523855e69b85a786f84b1d2c1c16fb277;hpb=84e68b1fc87491881b3262b05347cdd871b1a119;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index e189ac8..7c07480 100644
--- a/.shellrc
+++ b/.shellrc
@@ -72,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
@@ -95,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/"; }
@@ -122,10 +123,6 @@ x() { exit; }
 X() { startx >> .Xserver.log 2>&1; cyr; }
 
 
-git() {
-   LESS=FRSX"$LESS" command git "$@"
-}
-
 include()
 {
    cfg="$1"
@@ -141,13 +138,14 @@ include()
 }
 
 
-grep() { command grep --color=auto "$@"; }
-fgrep() { command fgrep --color=auto "$@"; }
-egrep() { command egrep --color=auto "$@"; }
-ls() { command ls --color=auto "$@"; }
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -208,8 +206,11 @@ 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
 }