Fancy prompt already sourced by bash.bashrc

diff --git a/files/etc/profile.d/prompt.sh b/files/bin/prompt.sh
similarity index 100%
rename from files/etc/profile.d/prompt.sh
rename to files/bin/prompt.sh

diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
index 89b5a578603798fe0439e6e27c2a4e89bdcc2786..22d06b10478bbe7bd5a9ba8aa14e580eae18aa2b 100644 (file)
--- a/files/etc/bash.bashrc
+++ b/files/etc/bash.bashrc
@@ -47,4 +47,3 @@ if [ -x /usr/lib/command-not-found ]; then
 fi
 
 . /usr/local/bin/prompt.sh
-PROMPT_COMMAND="command_prompt"

diff --git a/manifests/subsystems/profile.pp b/manifests/subsystems/profile.pp
index d09f7a60f1c76312bbd5281831179d559e95eaf8..e49e3b52ffe585b5ec7ed0efdd3215c369514578 100644 (file)
--- a/manifests/subsystems/profile.pp
+++ b/manifests/subsystems/profile.pp
@@ -19,7 +19,7 @@ class profile {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    require => File['/etc/profile.d/prompt.sh'],
+    require => File['/usr/local/bin/prompt.sh'],
   }
 
   file { "/etc/bash.bashrc":
@@ -28,30 +28,19 @@ class profile {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    require => File['/etc/profile.d/prompt.sh'],
+    require => File['/usr/local/bin/prompt.sh'],
   }
 
-  # As of squeeze, custom configuration can be placed directly at
-  # /etc/profile.d, so in the future this file has to stay there.
-  #
-  # This change has been backported to lenny via puppet so this
-  # file is not needed anymore.
   file { "/usr/local/bin/prompt.sh":
-    ensure => absent,
-  }
-
-  file { "/etc/profile.d":
-    ensure => directory,
-    owner  => "root",
-    group  => "root",
-  }
-
-  file { "/etc/profile.d/prompt.sh":
-    source  => "puppet://$server/modules/nodo/etc/profile.d/prompt.sh",
+    source  => "puppet://$server/modules/nodo/bin/prompt.sh",
     owner   => "root",
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    require => File['/etc/profile.d'],
+  }
+
+  # This is already being sourced by bash.bashrc.
+  file { "/etc/profile.d/prompt.sh":
+    ensure => absent,
   }
 }