functions() { typeset -f "$@"; }
j() { jobs; }
+ has_completion() { return 0; }
if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
if [ "$SHELL" = /bin/bash ]; then
- if [ -f /etc/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
. /etc/bash_completion
+ has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
elif [ -d /etc/bash_completion.d ]; then
- . /etc/bash_completion.d/*
+ 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
- . /usr/local/etc/bash_completion.d/*
+ for _compf in /usr/local/etc/bash_completion.d/*; do
+ . $_compf
+ done
+ has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
fi
else
- echo "Unknown OS type, canot source bash_completion" >&2
+ echo "Unknown OS type, cannot source bash_completion" >&2
fi
fi
- has_completion() { return 0; }
- if [ "$SHELL" = /bin/bash ]; then
- if [ -d /etc/bash_completion.d -o -d /usr/share/bash-completion/completions ]; then
- has_completion() { [ -r /etc/bash_completion.d/$1 -o -r /usr/share/bash-completion/completions/$1 ]; }
- fi
- elif [ "$SHELL" = /usr/local/bin/bash ]; then
- if [ -d /usr/local/etc/bash_completion.d ]; then
- has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
- 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 \
done
delegate_completion() {
- local prog completion_f programs
- prog="$1"
- if has_completion "$prog"; then
- completion_f="$2"
- shift; shift
+ local prog programs
+ prog=$1
+ if has_completion $prog; then
+ shift
programs="$@"
eval "_${prog}_completion_loader() {
_completion_loader $prog
- complete -F $completion_f $programs
+ complete -F _$prog $programs
unset _${prog}_completion_loader
return 124
}"
- complete -F _"$prog"_completion_loader $programs
+ complete -F _${prog}_completion_loader $programs
fi
}
- delegate_completion make _make m
- delegate_completion ping _ping p
- delegate_completion rsync _rsync r
- delegate_completion ssh _ssh s
- delegate_completion wget _wget wget-m wget-wrapper ww
+ delegate_completion make m
+ delegate_completion ping p
+ delegate_completion rsync r rsync_cgmn rsync_cgmn_recode
+ delegate_completion ssh s
+ delegate_completion wget wget-m wget-wrapper ww
unset has_completion delegate_completion
source virtualenvwrapper_lazy.sh 2>/dev/null
- #if [ -n "$VIRTUAL_ENV" ]; then
- # . "$VIRTUAL_ENV/bin/activate"
- #fi
+ if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; 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 - "$@"; }
if test -x /usr/bin/git >/dev/null 2>&1; then
+ # chdir to a directory
+ cdgitpath() {
+ if [ -z "$1" -o -n "$2" ]; then
+ echo "Usage: cdgitpath path_key" >&2
+ return 1
+ else
+ path_key="$1"
+ fi
+
+ if [ -z "$path_key" ]; then
+ echo "Usage: cdgitpath path_key" >&2
+ return 1
+ fi
+
+ cd "`git config --get --path $path_key`"
+ }
+
# 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
+ 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 git config --get remote.$remote.url | grep -q '^\(/\|\.\./\)'; then
+ 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
+
+ _list_remotes '^\(/\|\.\./\)' # (/ 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
- cd "`git config --get remote.$1.url`"
}
if test -n "$BASH_VERSION"; then
- # completion for global aliases in .gitconfig
+ # completion for aliases in global .gitconfig
# fixup rbi rbia rbiap rbip - do refs name completion
_git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
# 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]}";
+ COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
+ }
+
+ _git_open() {
+ _cdgitpath_complete
+ }
+
+ complete -F _cdgitpath_completion_loader cdgitpath git-open
+
# list remotes with URLs matching a regexp
_list_remotes() {
if [ -z "$1" -o -n "$2" ]; 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 - list remotes with a pattern
+ # completion for cdremote and git-open-remote - list remotes with a pattern
_list_remotes_completion() {
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)
+ if [ ${#COMPREPLY[*]} -eq 0 ]; then
+ _list_remotes_completion .
+ fi
}
complete -F _cdremote_complete cdremote
- # completion for git-open - list remotes with http(s) URLs
- _git_open() {
+ # completion for git-open-remote - list remotes with http(s) URLs
+ _git_open_remote() {
_list_remotes_completion '^http\(s\)\?://'
+ if [ ${#COMPREPLY[*]} -eq 0 ]; then
+ _list_remotes_completion .
+ fi
}
- complete -F _git_open git-open
+ complete -F _git_open_remote git-open-remote
fi
fi
case "$TERM" in
screen*) # screen, screen.rxvt
- if [ "$TERM" = screen.rxvt ]; then
- MC_SAVE_TERM="$TERM"
- TERM=rxvt
- fi
MC_XTERM="-x"
;;
esac
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
}
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; }
projects / dotfiles.git / blobdiff