X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=ee7f78e3da6ca6aa2bfcbc062ae3d1a3a6649522;hb=f2a3133673fae936bea5377bc385a7d8ea7f74c6;hp=38d9dcc2f54b85d95f335dde0141979497a402d8;hpb=171941f5107d46317e3487d611e60c59054b7782;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 38d9dcc..ee7f78e 100644 --- a/.shellrc +++ b/.shellrc @@ -66,41 +66,41 @@ if test -n "$BASH_VERSION"; then functions() { typeset -f "$@"; } j() { jobs; } - has_completion() { return 0; } if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then - if [ "$SHELL" = /bin/bash ]; then - if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; } - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - has_completion() { [ -r /etc/bash_completion.d/$1 ]; } - elif [ -d /etc/bash_completion.d ]; then - for _compf in /etc/bash_completion.d/*; do - . $_compf - done - has_completion() { [ -r /etc/bash_completion.d/$1 ]; } - fi - elif [ "$SHELL" = /usr/local/bin/bash ]; then - if [ -d /usr/local/etc/bash_completion.d ]; then - for _compf in /usr/local/etc/bash_completion.d/*; do - . $_compf - done - has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; } - fi + if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then + _BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions + . /usr/share/bash-completion/bash_completion + elif [ -r /etc/bash_completion ]; then + _BASH_COMPLETIONS_DIR=/etc/bash_completion.d + . /etc/bash_completion + elif [ -d /etc/bash_completion.d ]; then + _BASH_COMPLETIONS_DIR=/etc/bash_completion.d + for _compf in /etc/bash_completion.d/*; do + . $_compf + done + elif [ -d /usr/local/etc/bash_completion.d ]; then + _BASH_COMPLETIONS_DIR=/usr/local/etc/bash_completion.d + for _compf in /usr/local/etc/bash_completion.d/*; do + . $_compf + done else echo "Unknown OS type, cannot source bash_completion" >&2 fi fi + has_completion() { + [ -n "$_BASH_COMPLETIONS_DIR" -a -d "$_BASH_COMPLETIONS_DIR" -a -r "$_BASH_COMPLETIONS_DIR/$1" ] || + complete -p $1 >/dev/null 2>&1 + } + for cmd in builtin cgmem_nice command dbus-launch exec \ killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \ - 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 @@ -111,6 +111,16 @@ if test -n "$BASH_VERSION"; then ! has_completion $cmd && complete -o default -A hostname $cmd done + for cmd in bg fg jobs; do + ! has_completion $cmd && complete -A job $cmd + done + + complete -A job j wait + + for cmd in unset; do + ! has_completion $cmd && complete -A function -A variable $cmd + done + if [ -d "$HOME"/.bash_completion.d ]; then for _compf in "$HOME"/.bash_completion.d/*; do . $_compf @@ -120,29 +130,26 @@ if test -n "$BASH_VERSION"; then delegate_completion() { local prog programs prog=$1 - if has_completion $prog; then - shift - programs="$@" - eval "_${prog}_completion_loader() { - _completion_loader $prog - complete -o nospace -F _$prog $programs - unset _${prog}_completion_loader - return 124 - }" - complete -F _${prog}_completion_loader $programs - fi + ! has_completion $prog && return + shift + programs="$@" + eval "_${prog}_completion_loader() { + _completion_loader $prog + complete -F _$prog $programs + unset _${prog}_completion_loader + return 124 + }" + complete -F _${prog}_completion_loader $programs } delegate_completion make m delegate_completion ping p - delegate_completion rsync r rsync_cgmn rsync_cgmn_recode + delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 + delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2 delegate_completion ssh s delegate_completion wget wget-m wget-wrapper ww - unset has_completion delegate_completion - - complete -A job bg fg j jobs wait - complete -A variable -A function unset + unset _BASH_COMPLETIONS_DIR has_completion delegate_completion if [ -d "$HOME/lib/config" ]; then complete -W "`cd \"$HOME/lib/config\" && echo *`" include @@ -156,7 +163,6 @@ if test -n "$BASH_VERSION"; then #if type -p pip >/dev/null 2>&1; then # eval "`pip completion --bash`" - # rm -rf /tmp/pip_build_"$USER" #fi #if which pyenv >/dev/null 2>&1; then @@ -324,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 @@ -340,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