Bash-completion is written with FHS in mind where completion scripts
all get added to /usr/share/bash-completion/completions and are picked
up by the dynamic completion loader from there---whether they are
part of bash-completion or installed by another package.

On Guix systems, we want not only to search within bash-completion's own
directory, but also in the user's profile and guix home profile, as well
as in the system profile.
This is what this patch does.


--- a/bash_completion
+++ b/bash_completion
@@ -2173,7 +2173,15 @@ complete -F _minimal ''
 
 __load_completion()
 {
-    local -a dirs=(${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions)
+    local -a dirs=(
+        ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions
+        "$HOME/.guix-profile/share/bash-completion/completions"
+        "$HOME/.guix-profile/etc/bash_completion.d"
+        "$HOME/.guix-home/profile/share/bash-completion/completions"
+        "$HOME/.guix-home/profile/etc/bash_completion.d"
+        "/run/current-system/profile/share/bash-completion/completions"
+        "/run/current-system/profile/etc/bash_completion.d" )
+
     local ifs=$IFS IFS=: dir cmd="${1##*/}" compfile
     [[ -n $cmd ]] || return 1
     for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
         dirs+=( $dir/bash-completion/completions )
id=2afc79b51d0956e5834e81a70692a35cd83e4e87'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/union.scm'>
<input type='hidden' name='id' value='2afc79b51d0956e5834e81a70692a35cd83e4e87'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=2afc79b51d0956e5834e81a70692a35cd83e4e87'>root</a>/<a href='/guix/log/tests?id=2afc79b51d0956e5834e81a70692a35cd83e4e87'>tests</a>/<a href='/guix/log/tests/union.scm?id=2afc79b51d0956e5834e81a70692a35cd83e4e87'>union.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/union.scm?id=2afc79b51d0956e5834e81a70692a35cd83e4e87&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-14 21:57:39 +0200'>2019-06-14</span></td><td><a href='/guix/commit/tests/union.scm?id=03d76577b96ba81c9921eb3a297d42db8644280b'>tests: Make builds less expensive.</a><span class='msg-avail'>...<span class='msg-tooltip'>The switch to the reduced bootstrap broke build time assumptions made by
tests, notably the assumption that GNU-MAKE-BOOT0 was cheap to build.
This commit adjusts this to make these tests cheaper.

* gnu/packages/bootstrap.scm (%bootstrap-inputs-for-tests): New variable.
* guix/tests.scm (gnu-make-for-tests): New variable.
* tests/guix-environment.sh: Use GNU-MAKE-FOR-TESTS instead of
GNU-MAKE-BOOT0.  Remove test with FINDUTILS-BOOT0.
* tests/guix-package-net.sh (boot_make): Use GNU-MAKE-FOR-TESTS.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/profiles.scm ("profile-derivation relative symlinks, two entries"):
Likewise.
* tests/union.scm (%bootstrap-inputs): Remove.
("union-build"): Use %BOOTSTRAP-INPUTS-FOR-TESTS instead of
%BOOTSTRAP-INPUTS.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-23 09:46:25 +0200'>2018-09-23</span></td><td><a href='/guix/commit/tests/union.scm?id=c362904485d3c8c3f155538ab2f7cd082b334801'>bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): : New procedure
replacing %bootstrap-inputs to prepare for Mes bootstrap.  Update users.
* tests/union.scm (%bootstrap-inputs): New variable: set to
%bootstrap-inputs+toolchain.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-09-22 22:40:12 +0200'>2018-09-22</span></td><td><a href='/guix/commit/tests/union.scm?id=a2b2070b679ff7e92d856c7d6775f5f67ce4792d'>bootstrap: %bootstrap-inputs: Wrap input lists into thunks.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bootstrap.scm (%bootstrap-inputs): Change to procedure.  Update
users; prepares for Mes bootstrap.
* gnu/packages/commencement.scm (%boot0-inputs, %boot1-inputs, %boot2-inputs,
%boot3-inputs, %boot4-inputs, %boot5-inputs, %boot-6-inputs): Change to
procedure.  Update users.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths): Make a
procedure, filter on package?.  Update users.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2018-05-10 14:53:56 +0200'>2018-05-10</span></td><td><a href='/guix/commit/tests/union.scm?id=dac1c97d131d297134fa878ac240d9ec0127044b'>union: Add 'relative-file-name'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build/union.scm (%not-slash): New variable.
(relative-file-name): New procedure.
* tests/union.scm (test-relative-file-name): New macro and tests.
</span></span></td><td>Ludovic Courtès</td></tr>