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

diff --git a/.shellrc b/.shellrc
index e6ae420..e70784b 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
@@ -80,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)
@@ -95,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/"; }
@@ -137,12 +140,14 @@ include()
 }
 
 
-function git {
-   LESS=FRSX"$LESS" command git "$@"
-}
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -203,13 +208,16 @@ 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
 }
 
 
-function mkcd {
+mkcd() {
    if [ $# -ne 1 ]; then
       echo "Usage: mkcd directory_name" >&2
    elif [ -d "$1" ]; then