From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Wed, 29 Feb 2012 13:15:34 +0000 (+0100)
Subject: bash: Don't enable extended completion three times.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=6b0278f32376f57a5ef33853d4f8f4547ddcc4c3;p=matthijs%2Fservers%2Ftika.git

bash: Don't enable extended completion three times.

It is already enabled in /etc/profile.d/bash_completion, so don't also
enable it in /etc/bash.bashrc and ~/.bashrc as well.
---

diff --git a/etc/bash.bashrc b/etc/bash.bashrc
index 169413a..0834c29 100644
--- a/etc/bash.bashrc
+++ b/etc/bash.bashrc
@@ -34,11 +34,6 @@ PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 # or customize the prompt) in their ~/.bashrc as well.
 force_color_prompt=yes
 
-# enable bash completion in interactive shells
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-
 # if the command-not-found package is installed, use it
 if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found ]; then
 	function command_not_found_handle {
diff --git a/etc/skel/.bashrc b/etc/skel/.bashrc
index ab43aef..1afd4bc 100644
--- a/etc/skel/.bashrc
+++ b/etc/skel/.bashrc
@@ -93,10 +93,3 @@ fi
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi