aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-15 18:34:18 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-15 18:34:18 -0200
commit290469a28c7504341a89afc60e4d0078e50e78b0 (patch)
treedb68a0b52976f6bcdaafc5bb80695938de979429
parente88378ecb98bc3932aa8484837fefa04e5b9323b (diff)
downloadpuppet-nodo-290469a28c7504341a89afc60e4d0078e50e78b0.tar.gz
puppet-nodo-290469a28c7504341a89afc60e4d0078e50e78b0.tar.bz2
Prompt fixes
-rw-r--r--files/bin/prompt.sh2
-rw-r--r--files/etc/bash.bashrc3
-rw-r--r--files/etc/profile3
3 files changed, 4 insertions, 4 deletions
diff --git a/files/bin/prompt.sh b/files/bin/prompt.sh
index 9c43491..bdfc7ad 100644
--- a/files/bin/prompt.sh
+++ b/files/bin/prompt.sh
@@ -33,5 +33,3 @@ function command_prompt() {
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} "
}
-
-command_prompt
diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
index 0d66a14..ed7362a 100644
--- a/files/etc/bash.bashrc
+++ b/files/etc/bash.bashrc
@@ -46,4 +46,5 @@ if [ -x /usr/lib/command-not-found ]; then
}
fi
-PROMPT_COMMAND="/usr/local/bin/prompt.sh"
+. /usr/local/bin/prompt.sh
+PROMPT_COMMAND="command_prompt"
diff --git a/files/etc/profile b/files/etc/profile
index 3828b33..d397ec7 100644
--- a/files/etc/profile
+++ b/files/etc/profile
@@ -10,7 +10,8 @@ fi
if [ "$PS1" ]; then
if [ "$BASH" ]; then
PS1='\u@\h:\w\$ '
- PROMPT_COMMAND="/usr/local/bin/prompt.sh"
+ . /usr/local/bin/prompt.sh
+ PROMPT_COMMAND="command_prompt"
else
if [ "`id -u`" -eq 0 ]; then
PS1='# '