mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #32534 from hedning/bashstartup
nixos/programs/bash: Let bash-completion lazy load scripts
This commit is contained in:
commit
8168671385
@ -14,13 +14,16 @@ let
|
|||||||
bashCompletion = optionalString cfg.enableCompletion ''
|
bashCompletion = optionalString cfg.enableCompletion ''
|
||||||
# Check whether we're running a version of Bash that has support for
|
# Check whether we're running a version of Bash that has support for
|
||||||
# programmable completion. If we do, enable all modules installed in
|
# programmable completion. If we do, enable all modules installed in
|
||||||
# the system (and user profile).
|
# the system and user profile in obsolete /etc/bash_completion.d/
|
||||||
|
# directories. Bash loads completions in all
|
||||||
|
# $XDG_DATA_DIRS/share/bash-completion/completions/
|
||||||
|
# on demand, so they do not need to be sourced here.
|
||||||
if shopt -q progcomp &>/dev/null; then
|
if shopt -q progcomp &>/dev/null; then
|
||||||
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
|
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
|
||||||
nullglobStatus=$(shopt -p nullglob)
|
nullglobStatus=$(shopt -p nullglob)
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
for p in $NIX_PROFILES; do
|
for p in $NIX_PROFILES; do
|
||||||
for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do
|
for m in "$p/etc/bash_completion.d/"*; do
|
||||||
. $m
|
. $m
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user