From e56ad59baeb68aa49cb274aeb0b0ec742df06c72 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 18 Feb 2011 20:21:17 -0200
Subject: Fancy prompt already sourced by bash.bashrc

---
 files/bin/prompt.sh             | 37 +++++++++++++++++++++++++++++++++++++
 files/etc/bash.bashrc           |  1 -
 files/etc/profile.d/prompt.sh   | 37 -------------------------------------
 manifests/subsystems/profile.pp | 27 ++++++++-------------------
 4 files changed, 45 insertions(+), 57 deletions(-)
 create mode 100644 files/bin/prompt.sh
 delete mode 100644 files/etc/profile.d/prompt.sh

diff --git a/files/bin/prompt.sh b/files/bin/prompt.sh
new file mode 100644
index 0000000..85d7bff
--- /dev/null
+++ b/files/bin/prompt.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Fancy bash prompt.
+# See http://www.debian-administration.org/article/Fancy_Bash_Prompts
+#
+
+function command_prompt() {
+  exit_status="$?"
+  # colors
+  COLOR_RED="\[\033[31m\]"
+  COLOR_GREEN="\[\033[32m\]"
+  COLOR_YELLOW="\[\033[33m\]"
+  COLOR_BLUE="\[\033[34m\]"
+  COLOR_MAGENTA="\[\033[35m\]"
+  COLOR_CYAN="\[\033[36m\]"
+
+  COLOR_RED_BOLD="\[\033[31;1m\]"
+  COLOR_GREEN_BOLD="\[\033[32;1m\]"
+  COLOR_YELLOW_BOLD="\[\033[33;1m\]"
+  COLOR_BLUE_BOLD="\[\033[34;1m\]"
+  COLOR_MAGENTA_BOLD="\[\033[35;1m\]"
+  COLOR_CYAN_BOLD="\[\033[36;1m\]"
+
+  COLOR_NONE="\[\033[0m\]"
+  BOLD="\[\033[1m\]"
+
+  if [ "$exit_status" == "0" ]; then
+    status_color="${COLOR_GREEN}"
+  else
+    status_color="${COLOR_RED_BOLD}"
+  fi
+
+  PS1="(${status_color}${exit_status}${COLOR_NONE}) [${COLOR_RED}\D{%Y%m%d %H:%M:%S}${COLOR_NONE}] ${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \\$ "
+  PS2="${BOLD}>${OFF} "
+}
+
+PROMPT_COMMAND="command_prompt"
diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
index 89b5a57..22d06b1 100644
--- 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/files/etc/profile.d/prompt.sh b/files/etc/profile.d/prompt.sh
deleted file mode 100644
index 85d7bff..0000000
--- a/files/etc/profile.d/prompt.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# Fancy bash prompt.
-# See http://www.debian-administration.org/article/Fancy_Bash_Prompts
-#
-
-function command_prompt() {
-  exit_status="$?"
-  # colors
-  COLOR_RED="\[\033[31m\]"
-  COLOR_GREEN="\[\033[32m\]"
-  COLOR_YELLOW="\[\033[33m\]"
-  COLOR_BLUE="\[\033[34m\]"
-  COLOR_MAGENTA="\[\033[35m\]"
-  COLOR_CYAN="\[\033[36m\]"
-
-  COLOR_RED_BOLD="\[\033[31;1m\]"
-  COLOR_GREEN_BOLD="\[\033[32;1m\]"
-  COLOR_YELLOW_BOLD="\[\033[33;1m\]"
-  COLOR_BLUE_BOLD="\[\033[34;1m\]"
-  COLOR_MAGENTA_BOLD="\[\033[35;1m\]"
-  COLOR_CYAN_BOLD="\[\033[36;1m\]"
-
-  COLOR_NONE="\[\033[0m\]"
-  BOLD="\[\033[1m\]"
-
-  if [ "$exit_status" == "0" ]; then
-    status_color="${COLOR_GREEN}"
-  else
-    status_color="${COLOR_RED_BOLD}"
-  fi
-
-  PS1="(${status_color}${exit_status}${COLOR_NONE}) [${COLOR_RED}\D{%Y%m%d %H:%M:%S}${COLOR_NONE}] ${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \\$ "
-  PS2="${BOLD}>${OFF} "
-}
-
-PROMPT_COMMAND="command_prompt"
diff --git a/manifests/subsystems/profile.pp b/manifests/subsystems/profile.pp
index d09f7a6..e49e3b5 100644
--- 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,
   }
 }
-- 
cgit v1.2.3