X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7388d5a59743eb30f696805401708f4ed5f5c751;hb=85f7998067cab03a7ea1bb71e85e92887141442c;hp=70393ad7d51d3cc77db6f10d5a66d4590bea5897;hpb=fb77946f36e1fa4cfaeb4a5af00f45e28dca73af;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 70393ad..7388d5a 100644 --- a/.shellrc +++ b/.shellrc @@ -95,12 +95,12 @@ if test -n "$BASH_VERSION"; then for cmd in builtin cgmem_nice command dbus-launch exec \ killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \ - run-all-hosts su sudo time whence whereis which xargs; do + run-hosts su sudo time whence whereis which xargs; do ! has_completion $cmd && complete -o default -A command $cmd done - for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 socat \ - telnet t tt \ + for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 \ + ssh2 s2 socat telnet t tt \ tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \ whois wd wget wget-download wget-m wget-wrapper ww; do ! has_completion $cmd && complete -A hostname $cmd @@ -118,7 +118,7 @@ if test -n "$BASH_VERSION"; then complete -A job j wait for cmd in unset; do - ! has_completion $cmd && complete -A variable -A function $cmd + ! has_completion $cmd && complete -A function -A variable $cmd done if [ -d "$HOME"/.bash_completion.d ]; then @@ -330,12 +330,13 @@ fi include() { cfg="$1" + shift if [ -f "./$cfg" -a -r "./$cfg" ]; then echo "Reading config file \`$cfg'" 1>&2 - . "./$cfg" + . "./$cfg" "$@" elif [ -f "$HOME/lib/config/$cfg" -a -r "$HOME/lib/config/$cfg" ]; then echo "Reading config file \`$HOME/lib/config/$cfg'" 1>&2 - . "$HOME/lib/config/$cfg" + . "$HOME/lib/config/$cfg" "$@" else echo "Cannot find config file \`$cfg'" 1>&2 fi @@ -346,10 +347,17 @@ mc() { if test -n "$BASH_VERSION"; then MC_SAVE_OPS1="$OPS1" if [ "`type -t short_curdir`" = function ]; then - OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` " - OPS1+="\$(prompt_git)\\$\$SHLVL " + OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`" + if test -x /usr/bin/git >/dev/null 2>&1; then + if [ "`type -t __git_ps1`" = function ]; then + OPS1+="\$(__git_ps1)" + else + OPS1+="\$(prompt_git)" + fi + fi + OPS1+=" \$SHLVL\\$ " else - OPS1="\u@\h:\W \\$" + OPS1="\u@\h:\W \$SHLVL\\$ " fi fi