X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=1db7013282a2242b6e94423491304ad2737c217e;hp=d9a20856b7dd7d342a2f1e8110c7c169cdc8cb6a;hb=a1d086a56f5589110dcc6aff9ee0eabf1954f5e5;hpb=1b4145b1d1debe2e0c92e4db7af5f1437fa9d0c5 diff --git a/.shellrc b/.shellrc index d9a2085..1db7013 100644 --- a/.shellrc +++ b/.shellrc @@ -57,11 +57,6 @@ case "$HOME" in ;; esac - -OPS1="$OPS1\\$" -PS1="$OPS1 " - - if test -n "$BASH_VERSION"; then [ "`type -t ls`" = alias ] && unalias ls [ "`type -t ll`" = alias ] && unalias ll @@ -71,71 +66,80 @@ 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 ]; 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 - if [ -d "$HOME"/.bash_completion.d ]; then - for _compf in "$HOME"/.bash_completion.d/*; do - . $_compf - done - 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 - ! has_completion $cmd && complete -o default -A command $cmd + killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \ + run-all-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 \ - tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \ - whois wget wget-m wget-wrapper ww; do - ! has_completion $cmd && complete -A hostname $cmd + 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 done for cmd in distribute ftp lftp r rsync \ - s scp ssh smbclient tcpdump tshark wireshark; do - ! has_completion $cmd && complete -o default -A hostname $cmd; + s scp ssh smbclient tcpdump tshark wireshark; do + ! 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 variable -A function $cmd + done + + if [ -d "$HOME"/.bash_completion.d ]; then + for _compf in "$HOME"/.bash_completion.d/*; do + . $_compf + done + fi + delegate_completion() { local prog programs prog=$1 - if has_completion $prog; then - 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 - fi + ! has_completion $prog && return + 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 } delegate_completion make m @@ -144,16 +148,18 @@ if test -n "$BASH_VERSION"; then 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 fi complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser + if [ "`type -t short_curdir`" != function -a \ + -r "$HOME"/admin/prog/bash_prompt ]; then + . "$HOME"/admin/prog/bash_prompt + fi + #if type -p pip >/dev/null 2>&1; then # eval "`pip completion --bash`" # rm -rf /tmp/pip_build_"$USER" @@ -164,7 +170,7 @@ if test -n "$BASH_VERSION"; then # eval "`pyenv virtualenv-init -`" #fi - source virtualenvwrapper_lazy.sh 2>/dev/null + . virtualenvwrapper_lazy.sh 2>/dev/null if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then . "$VIRTUAL_ENV/bin/activate" @@ -180,6 +186,7 @@ elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then j() { jobs; } fi +PS1="$OPS1" # clear screen and history, logout chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; } @@ -188,40 +195,67 @@ chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; } if test -x /usr/bin/git >/dev/null 2>&1; then # chdir to a directory cdgitpath() { - if [ -z "$1" -o -n "$2" ]; then + if [ $# -ne 1 ]; then echo "Usage: cdgitpath path_key" >&2 return 1 - else - path_key="$1" fi + path_key="$1" if [ -z "$path_key" ]; then echo "Usage: cdgitpath path_key" >&2 return 1 fi - cd "`git config --get --path $path_key`" + path_url="`git config --get --path $path_key`" + if echo "$path_url" | grep -q '^file:/'; then + path_url="`echo \"$path_url\" | sed 's@^file:/\+@/@'`" + fi + cd "$path_url" } # chdir to a remote's directory (if the remote is on the local FS) cdremote() { + if [ $# -gt 1 ]; then + echo "Usage: cdremote [remote_name]" >&2 + return 1 + fi + if [ -z "$1" ]; then branch="`git rev-parse --abbrev-ref HEAD`" remote="`git config --get branch.$branch.remote`" - elif [ -n "$2" ]; then - echo "Usage: cdremote [remote_name]" >&2 - return 1 else remote="$1" fi - if [ -z "$remote" ]; then - echo "Cannot find remote for branch $branch" >&2 - echo "Usage: cdremote [remote_name]" >&2 - return 1 - fi + if [ -n "$remote" ] && git config --get remote.$remote.url | + grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning) + cdgitpath remote.$remote.url + else + + if [ -n "$1" ]; then + echo "Cannot find directory for remote $1" >&2 + echo "Usage: cdremote [remote_name]" >&2 + return 1 + fi - cdgitpath remote.$remote.url + if test -n "$BASH_VERSION"; then + _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning) + if [ ${#GIT_REMOTES[*]} -eq 1 ]; then + remote=${GIT_REMOTES[0]} + unset GIT_REMOTES + cdgitpath remote.$remote.url + else + unset GIT_REMOTES + echo "Cannot find directory for any remote" >&2 + echo "Usage: cdremote [remote_name]" >&2 + return 1 + fi + else + echo "Cannot find directory for remote $1" >&2 + echo "Usage: cdremote [remote_name]" >&2 + return 1 + fi + fi } if test -n "$BASH_VERSION"; then @@ -237,15 +271,8 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # push-to-all-remotes - do branch name completion _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; } - _cdgitpath_completion_loader() { - _completion_loader git - complete -F _cdgitpath_complete cdgitpath git-open - unset _cdgitpath_completion_loader - return 124 - } - _cdgitpath_complete() { - local cword="${COMP_CWORD}" cur="${COMP_WORDS[COMP_CWORD]}"; + local cur="${COMP_WORDS[COMP_CWORD]}" COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`) } @@ -253,34 +280,34 @@ if test -x /usr/bin/git >/dev/null 2>&1; then _cdgitpath_complete } - complete -F _cdgitpath_completion_loader cdgitpath git-open + complete -F _cdgitpath_complete cdgitpath git-open # list remotes with URLs matching a regexp _list_remotes() { - if [ -z "$1" -o -n "$2" ]; then + if [ $# -ne 1 ]; then echo "Usage: _list_remotes remote_regexp" >&2 return 1 fi - GIT_REMOTES="" + declare -ag GIT_REMOTES=() local remote for remote in `git remote`; do if git config --get remote.$remote.url | grep -q "$1"; then - GIT_REMOTES="$GIT_REMOTES $remote" + GIT_REMOTES+=($remote) fi done } # completion for cdremote and git-open-remote - list remotes with a pattern _list_remotes_completion() { - local cur="${COMP_WORDS[COMP_CWORD]}"; + local cur="${COMP_WORDS[COMP_CWORD]}" _list_remotes "$1" - COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`) + COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`) unset GIT_REMOTES } # completion for cdremote - list remotes with directories as URLs _cdremote_complete() { - _list_remotes_completion '^\(/\|\.\./\)' # (/ or ../ at the beginning) + _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning) if [ ${#COMPREPLY[*]} -eq 0 ]; then _list_remotes_completion . fi @@ -318,7 +345,19 @@ include() { mc() { if test -n "$BASH_VERSION"; then MC_SAVE_OPS1="$OPS1" - OPS1="\u@\h " + if [ "`type -t short_curdir`" = function ]; then + 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 \\$" + fi fi if [ -n "$SLOWTERM" ]; then