Apply pristine bash.bashrc

diff --git a/files/bash.bashrc b/files/bash.bashrc
index 27686d696a70e8299d6f21d820eec5e213fcd550..54687b1d68f858e82e7d061b6fa5241d803b0fab 100644 (file)
--- a/files/bash.bashrc
+++ b/files/bash.bashrc
@@ -16,10 +16,7 @@ if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
 fi
 
 # set a fancy prompt (non-color, overwrite the one in /etc/profile)
-#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-
-# set a fancy prompt
-. /etc/profile.d/prompt.sh
+PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 
 # Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
 # If this is an xterm set the title to user@host:dir
@@ -32,13 +29,13 @@ fi
 #esac
 
 # enable bash completion in interactive shells
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
+#if ! shopt -oq posix; then
+#  if [ -f /usr/share/bash-completion/bash_completion ]; then
+#    . /usr/share/bash-completion/bash_completion
+#  elif [ -f /etc/bash_completion ]; then
+#    . /etc/bash_completion
+#  fi
+#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/command-not-found ]; then

diff --git a/manifests/init.pp b/manifests/init.pp
index 56da9eaf4065c7f38c120fc8cb7f15d9f8a26653..23f53f426ee4d5f6b042e9c1654ce2351d36ad0f 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,13 +7,13 @@ class shellprompt {
     ensure  => present,
   }
 
-  # Ideally we should not manage this file, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675008
-  #file { "/etc/bash.bashrc":
-  #  source  => "puppet:///modules/shellprompt/bash.bashrc",
-  #  owner   => "root",
-  #  group   => "root",
-  #  mode    => 0644,
-  #  ensure  => present,
-  #  require => File['/etc/profile.d/prompt.sh'],
-  #}
+  # TODO: remove this block in the future, as we're applying back jessie's version
+  file { "/etc/bash.bashrc":
+    source  => "puppet:///modules/shellprompt/bash.bashrc",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    require => File['/etc/profile.d/prompt'],
+  }
 }