X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7c0748000784c407bc3f4b020209100341caa8e1;hb=6bf46a8c8b9fdcc6162f904d3f318e3500212686;hp=50dfa870935e741d1bb3f71239a19975e05c82db;hpb=a116737b33bcc774c97d38101b130425df6aa90d;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 50dfa87..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/"; } @@ -137,10 +138,14 @@ include() } -} - - mc() { + case "$SHELL" in + */bash) + MC_SAVE_OPS1="$OPS1" + OPS1="\u@\h " + ;; + esac + if [ -n "$SLOWTERM" ]; then MC_SLOW="--slow" fi @@ -201,13 +206,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