From: Oleg Broytman <phd@phdru.name>
Date: Sun, 5 Apr 2020 15:08:50 +0000 (+0300)
Subject: .shellrc: Minor refactoring
X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=commitdiff_plain;h=d992db58d6cb4f4a2bb2218e3299511ebc629b6b

.shellrc: Minor refactoring

Source `~/.bash_completion.d/` after all completions.
---

diff --git a/.shellrc b/.shellrc
index 10b3e9b..fd73f15 100644
--- a/.shellrc
+++ b/.shellrc
@@ -98,12 +98,6 @@ if test -n "$BASH_VERSION"; 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
@@ -122,6 +116,12 @@ if test -n "$BASH_VERSION"; then
          ! 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