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 -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
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
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
+ 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
programs="$@"
eval "_${prog}_completion_loader() {
_completion_loader $prog
- complete -F _$prog $programs
+ complete -o nospace -F _$prog $programs
unset _${prog}_completion_loader
return 124
}"
# 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"
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 git config --get remote.$remote.url | grep -q '^\(/\|\.\./\)'; then
+ if [ -n "$remote" ] && git config --get remote.$remote.url |
+ grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning)
cdgitpath remote.$remote.url
else
- _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
- if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
- remote=${GIT_REMOTES[0]}
- unset GIT_REMOTES
- cdgitpath remote.$remote.url
+ if [ -n "$1" ]; then
+ echo "Cannot find directory for remote $1" >&2
+ echo "Usage: cdremote [remote_name]" >&2
+ return 1
+ fi
+
+ 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
- unset GIT_REMOTES
- echo "Cannot find directory for any remote" >&2
+ echo "Cannot find directory for remote $1" >&2
echo "Usage: cdremote [remote_name]" >&2
return 1
fi
# 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"`)
}
_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
# 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
projects / dotfiles.git / blobdiff