.bashrc: Check the dir is not empty before looping over files

[dotfiles.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 85cb4d87d8dbe099264af8d6b323b72131fb6576..fb3641009418025cf8e95870087abcc46e00a5ea 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
@@ -116,7 +118,8 @@ for cmd in unset; do
     ! has_completion $cmd && complete -A function -A variable $cmd
 done
 
-if [ -d "$HOME"/.bash_completion.d ]; then
+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
@@ -235,6 +238,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