X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=b0ba00f8576537101d93af2989958dd7aa73aec5;hb=c62f4a398bfa5262b1fc8fa46ef88285933f79f8;hp=bd1228e0d3a2caa4ec101307e34917d40c51ead5;hpb=9aca2212d4f0f30950d273f84f702e9ff0a098cc;p=dotfiles.git diff --git a/.shellrc b/.shellrc index bd1228e..b0ba00f 100644 --- a/.shellrc +++ b/.shellrc @@ -9,11 +9,11 @@ # If not running interactively, don't do anything case $- in *i*) ;; - *) return;; + *) return ;; esac # Stop if non-interactive shell -# [ -z "$PS1" ] && return +[ -z "$PS1" ] && return if test -n "$BASH_VERSION"; then # append to the history file, don't overwrite it @@ -68,7 +68,6 @@ if test -n "$BASH_VERSION"; then [ "`type -t mc`" = alias ] && unalias mc back() { cd - "$@"; } - clo() { clear; logout; } functions() { typeset -f "$@"; } j() { jobs; } @@ -84,7 +83,7 @@ if test -n "$BASH_VERSION"; then . /usr/local/etc/bash_completion.d/* fi else - echo "Unknown OS type, canot source bash_completion" >&2 + echo "Unknown OS type, cannot source bash_completion" >&2 fi fi @@ -105,7 +104,7 @@ if test -n "$BASH_VERSION"; then ! has_completion $cmd && complete -o default -A command $cmd done - for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \ + 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 @@ -116,10 +115,33 @@ if test -n "$BASH_VERSION"; then s scp ssh smbclient tcpdump tshark wireshark; do ! has_completion $cmd && complete -o default -A hostname $cmd; done - unset has_completion + + 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 + } + + delegate_completion make m + delegate_completion ping p + delegate_completion rsync r + 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 unset + complete -A variable -A function unset if [ -d "$HOME/lib/config" ]; then complete -W "`cd \"$HOME/lib/config\" && echo *`" include @@ -131,49 +153,56 @@ if test -n "$BASH_VERSION"; then # rm -rf /tmp/pip_build_"$USER" #fi + #if which pyenv >/dev/null 2>&1; then + # eval "`pyenv init -`" + # eval "`pyenv virtualenv-init -`" + #fi + + source virtualenvwrapper_lazy.sh 2>/dev/null + + #if [ -n "$VIRTUAL_ENV" ]; then + # . "$VIRTUAL_ENV/bin/activate" + #fi + elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then back() { cd - "$@"; } - clo() { clear; exit; } j() { jobs; } - -else - clo() { clear; exit; } fi -# clear history, clear screen and logout -#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clo; } - - -#Pwd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)\/\(.*\)\/\(.*\)/...\/\2\/\3\/\4/"; } -#PWd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)/...\/\2/"; } - - -psg() { ps auxw | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; } -pswg() { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; } - -# Like pgrep -f -pidOf() { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; } - -# A kind of pkill/killall -KillAll() { - if [ -z "$2" ]; then - kill `pidOf "$1"` - else - kill "$1" `pidOf "$2"` - fi -} +# clear screen and history, logout +chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; } if test -x /usr/bin/git >/dev/null 2>&1; then # chdir to a remote's directory (if the remote is on the local FS) cdremote() { + if [ -z "$1" -o -n "$2" ]; then + echo "Usage: cdremote remote_name" >&2 + return 1 + fi cd "`git config --get remote.$1.url`" } if test -n "$BASH_VERSION"; then + # completion for global aliases in .gitconfig + + # fixup rbi rbia rbiap rbip - do refs name completion + _git_fixup() { __gitcomp_nl "$(__git_refs)" ; } + _git_rbi() { __gitcomp_nl "$(__git_refs)" ; } + _git_rbia() { __gitcomp_nl "$(__git_refs)" ; } + _git_rbiap() { __gitcomp_nl "$(__git_refs)" ; } + _git_rbip() { __gitcomp_nl "$(__git_refs)" ; } + # + # push-to-all-remotes - do branch name completion + _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; } + # list remotes with URLs matching a regexp - list_remotes() { + _list_remotes() { + if [ -z "$1" -o -n "$2" ]; then + echo "Usage: _list_remotes remote_regexp" >&2 + return 1 + fi GIT_REMOTES="" local remote for remote in `git remote`; do @@ -183,22 +212,24 @@ if test -x /usr/bin/git >/dev/null 2>&1; then done } - # completion for cdremote - list remotes with directories as URLs - _cdremote_complete() { + # completion for cdremote and git-open - list remotes with a pattern + _list_remotes_completion() { local cur="${COMP_WORDS[COMP_CWORD]}"; - list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning) + _list_remotes "$1" 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) + } + complete -F _cdremote_complete cdremote # completion for git-open - list remotes with http(s) URLs _git_open() { - local cur="${COMP_WORDS[COMP_CWORD]}"; - list_remotes '^http\(s\)\?://' - COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`) - unset GIT_REMOTES + _list_remotes_completion '^http\(s\)\?://' } complete -F _git_open git-open @@ -323,16 +354,6 @@ if which tmux >/dev/null 2>&1; then fi -#if which pyenv >/dev/null 2>&1; then -# eval "`pyenv init -`" -# eval "`pyenv virtualenv-init -`" -#fi - -if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then - source /usr/local/bin/virtualenvwrapper_lazy.sh -fi - - if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then X() { startx >> .Xserver.log 2>&1; cyr; } fi