From 16713db4e294689c55c44615754b08576640f6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 16:37:14 +0200 Subject: [PATCH] modules/programs/bash/bashrc.sh: adapt bash completion for version 2.0 of the package --- modules/programs/bash/bashrc.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index 79583a73174..74550656151 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -31,13 +31,9 @@ fi # programmable completion. If we do, and if the current user has # installed the package 'bash-completion' in her $HOME/.nix-profile, # then completion is enabled automatically. -if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then - if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then - if shopt -q progcomp &>/dev/null; then - BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d" - BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion" - . "$BASH_COMPLETION" - fi +if [ -f "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" ]; then + if shopt -q progcomp &>/dev/null; then + . "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" fi fi