modules/programs/bash/bashrc.sh: adapt bash completion for version 2.0 of the package

This commit is contained in:
Peter Simons 2012-08-20 16:37:14 +02:00
parent 5dc8bc5f2a
commit 16713db4e2

View File

@ -31,13 +31,9 @@ fi
# programmable completion. If we do, and if the current user has # programmable completion. If we do, and if the current user has
# installed the package 'bash-completion' in her $HOME/.nix-profile, # installed the package 'bash-completion' in her $HOME/.nix-profile,
# then completion is enabled automatically. # then completion is enabled automatically.
if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then if [ -f "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" ]; then
if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then if shopt -q progcomp &>/dev/null; then
if shopt -q progcomp &>/dev/null; then . "$HOME/.nix-profile/etc/profile.d/bash_completion.sh"
BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d"
BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion"
. "$BASH_COMPLETION"
fi
fi fi
fi fi