.bashrc: Extract oft-edited completion to a separate file

[dotfiles.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index f516a374c36abd98560693fb7bfb4ed4247152fb..8797927ad530af6dbf163e195084448c5d4fb1a3 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -68,12 +68,14 @@ if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
     elif [ -r /etc/bash_completion ]; then
         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
         . /etc/bash_completion
-    elif [ -d /etc/bash_completion.d ]; then
+    elif [ -d /etc/bash_completion.d ] &&
+            [ -n "`ls -A /etc/bash_completion.d`" ]; then
         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
         for _compf in /etc/bash_completion.d/*; do
             . $_compf
         done
-    elif [ -d /usr/local/etc/bash_completion.d ]; then
+    elif [ -d /usr/local/etc/bash_completion.d ] &&
+            [ -n "`ls -A /usr/local/etc/bash_completion.d`" ]; then
         _BASH_COMPLETIONS_DIR=/usr/local/etc/bash_completion.d
         for _compf in /usr/local/etc/bash_completion.d/*; do
             . $_compf
@@ -91,41 +93,35 @@ has_completion() {
 for cmd in builtin cgmem_nice command dbus-launch exec \
         killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
         run-hosts su sudo time whence whereis which xargs; do
-    ! has_completion $cmd && complete -o default -A command $cmd
+    has_completion $cmd || complete -o default -A command $cmd
 done
 
 for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 \
         ssh2 s2 socat telnet t tt \
         tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
         whois wd wget wget-download wget-m wget-wrapper ww; do
-    ! has_completion $cmd && complete -A hostname $cmd
+    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
 
 for cmd in bg fg jobs; do
-    ! has_completion $cmd && complete -A job $cmd
+    has_completion $cmd || complete -A job $cmd
 done
 
 complete -A job j wait
 
 for cmd in unset; do
-    ! has_completion $cmd && complete -A function -A variable $cmd
+    has_completion $cmd || complete -A function -A variable $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
-    ! has_completion $prog && return
+    has_completion $prog || return 0
     shift
     programs="$@"
     eval "_${prog}_completion_loader() {
@@ -143,11 +139,17 @@ delegate_completion() {
 
 delegate_completion make m
 delegate_completion ping p
-delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3.11
 DELEGATE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
 delegate_completion ssh s
 delegate_completion wget wget-m wget-wrapper ww
 
+if [ -d "$HOME"/.bash_completion.d -a \
+        -n "`ls -A $HOME/.bash_completion.d`" ]; then
+    for _compf in "$HOME"/.bash_completion.d/*; do
+        . $_compf
+    done
+fi
+
 unset _BASH_COMPLETIONS_DIR has_completion delegate_completion
 
 if [ -d "$HOME/lib/config" ]; then
@@ -160,20 +162,18 @@ if [ "`type -t short_curdir`" != function -a \
     . "$HOME"/admin/prog/bash_prompt
 fi
 
-if type -p pip >/dev/null 2>&1 || type -p pip3 >/dev/null 2>&1; then
-    _pip_completion_loader() {
-        eval "`pip completion --bash`"
-        complete -F _pip_completion pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11
-        unset _pip_completion_loader
-        return 124
-    }
-    complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11
+if test -d "$HOME"/.pyenv
+then
+    PYENV_ROOT="$HOME"/.pyenv
+    export PYENV_ROOT
+    PATH="$PYENV_ROOT/bin:$PATH"
+    if which pyenv >/dev/null 2>&1; then
+#        eval "`pyenv init --path`"
+        eval "`pyenv init -`"
+        eval "`pyenv virtualenv-init -`"
+    fi
 fi
 
-#if which pyenv >/dev/null 2>&1; then
-#   eval "`pyenv init -`"
-#   eval "`pyenv virtualenv-init -`"
-#fi
 
 . virtualenvwrapper_lazy.sh 2>/dev/null
 
@@ -188,26 +188,6 @@ trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT
 
 
 if test -x /usr/bin/git >/dev/null 2>&1; then
-    # chdir to a directory
-    cdgitpath() {
-        if [ $# -ne 1 ]; then
-            echo "Usage: cdgitpath path_key" >&2
-            return 1
-        fi
-
-        path_key="$1"
-        if [ -z "$path_key" ]; then
-            echo "Usage: cdgitpath path_key" >&2
-            return 1
-        fi
-
-        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
@@ -247,6 +227,24 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
         fi
     }
 
+    # completion for `cd_worktree`
+
+    _cd_worktree_comp() {
+        local cur="${COMP_WORDS[COMP_CWORD]}"
+        COMPREPLY=(`compgen -W "$(
+            git worktree list | awk '{s=$3; gsub("[\\\\[\\\\]]", "", s); print s}'
+        )" -- "$cur"`)
+    }
+
+    _cd_worktree_comp_loader() {
+        _completion_loader git
+        unset _cd_worktree_comp_loader
+        complete -F _cd_worktree_comp cd_worktree
+        return 124
+    }
+
+    complete -F _cd_worktree_comp_loader cd_worktree
+
     # completion for aliases in global .gitconfig
 
     # fixup rbi rbia rbiap rbip - do refs name completion
@@ -332,3 +330,10 @@ if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&
 
     X() { history -a; _non_bash_X; history -r; }
 fi
+
+if test -x /usr/bin/screen >/dev/null 2>&1; then
+    screen_newwin() {
+        history -a
+        screen "$@"
+    }
+fi