bash: Don't enable extended completion three times.

[matthijs/servers/tika.git] / etc / skel / .bashrc

diff --git a/etc/skel/.bashrc b/etc/skel/.bashrc
index e96b37fb46a87ddb6f6d624246c477ea3ac8ff3d..1afd4bc18879d3491beb647e6fd2f92858a0de4a 100644 (file)
--- a/etc/skel/.bashrc
+++ b/etc/skel/.bashrc
@@ -33,10 +33,9 @@ case "$TERM" in
     xterm-color) color_prompt=yes;;
 esac
 
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
+# colored prompts are enabled by default in /etc/bash.bashrc, uncomment this to
+# disable them.
+#force_color_prompt=
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@@ -56,11 +55,15 @@ else
 fi
 unset color_prompt force_color_prompt
 
-# If this is an xterm set the title to user@host:dir
+# If this is an xterm or screen set the title to user@host:dir
 case "$TERM" in
 xterm*|rxvt*)
     PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
     ;;
+screen)
+    # Only show the hostname in screen, since there is less space
+    PS1="\[\ek${debian_chroot:+($debian_chroot)}\u@\h:\e\134\]$PS1"
+    ;;
 *)
     ;;
 esac
@@ -90,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