X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=16102b4a447be53bb3dd29196dc89270a6fe5f75;hp=b4b4e05913aec791a56830ca7c01ba9b003a1c58;hb=3c555a44022fd52fa8bbdd629fcfbff222ed800e;hpb=59e5881d91c20244b189a8899a02cd01bc127af3 diff --git a/.shellrc b/.shellrc index b4b4e05..16102b4 100644 --- a/.shellrc +++ b/.shellrc @@ -74,7 +74,7 @@ if test -n "$BASH_VERSION"; then has_completion() { return 0; } if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then if [ "$SHELL" = /bin/bash ]; then - if [ -d /usr/share/bash_completion ]; 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 @@ -98,6 +98,12 @@ if test -n "$BASH_VERSION"; then fi fi + if [ -d "$HOME"/.bash_completion.d ]; then + for _compf in "$HOME"/.bash_completion.d/*; do + . $_compf + done + fi + 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 @@ -107,13 +113,13 @@ if test -n "$BASH_VERSION"; then 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 + 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; + ! has_completion $cmd && complete -o default -A hostname $cmd done delegate_completion() { @@ -124,7 +130,7 @@ if test -n "$BASH_VERSION"; then programs="$@" eval "_${prog}_completion_loader() { _completion_loader $prog - complete -F _$prog $programs + complete -o nospace -F _$prog $programs unset _${prog}_completion_loader return 124 }" @@ -134,7 +140,7 @@ if test -n "$BASH_VERSION"; then delegate_completion make m delegate_completion ping p - delegate_completion rsync r + delegate_completion rsync r rsync_cgmn rsync_cgmn_recode delegate_completion ssh s delegate_completion wget wget-m wget-wrapper ww @@ -164,6 +170,11 @@ if test -n "$BASH_VERSION"; then . "$VIRTUAL_ENV/bin/activate" fi + # Clean up python virtual environment on exit + # See https://virtualenvwrapper.readthedocs.io/en/latest/tips.html#clean-up-environments-on-exit + + trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT + elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then back() { cd - "$@"; } j() { jobs; } @@ -177,40 +188,61 @@ 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 + _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 + fi } if test -n "$BASH_VERSION"; then @@ -226,15 +258,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"`) } @@ -242,34 +267,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 @@ -316,10 +341,6 @@ mc() { case "$TERM" in screen*) # screen, screen.rxvt - if [ "$TERM" = screen.rxvt ]; then - MC_SAVE_TERM="$TERM" - TERM=rxvt - fi MC_XTERM="-x" ;; esac @@ -371,9 +392,7 @@ mc() { 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_OPS1 MC_SAVE_TERM \ - MC_SLOW MC_TMP_DIR MC_XTERM + unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SLOW MC_TMP_DIR MC_XTERM return $rc } @@ -408,7 +427,7 @@ fi if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then - X() { startx >> .Xserver.log 2>&1; cyr; } + X() { startx >> .Xserver.log 2>&1; cyr; rm -f .Xauthority; } fi x() { exit; }