X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=a78a8e1efabecf156f72581d30dbfc8105d18143;hb=d239699bd1163d2ff6459dd79e2fcb276747e131;hp=513431d56037a9e60c7e5774e003ec8f67957160;hpb=49085342eddc71906df583beacafd855d2caca90;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 513431d..a78a8e1 100644 --- a/.shellrc +++ b/.shellrc @@ -113,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() { @@ -130,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 }" @@ -220,7 +220,8 @@ if test -x /usr/bin/git >/dev/null 2>&1; then remote="$1" fi - if [ -n "$remote" ] && git config --get remote.$remote.url | grep -q '^\(file:/\|/\|\.\./\)'; then + if [ -n "$remote" ] && git config --get remote.$remote.url | + grep -q '^\(file:/\|/\|\.\./\)'; then cdgitpath remote.$remote.url else @@ -258,7 +259,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; } _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"`) } @@ -285,7 +286,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # 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"`) unset GIT_REMOTES