Prompt fixes

diff --git a/files/bin/prompt.sh b/files/bin/prompt.sh
index 9c43491f6d1d98ae4477c28dfe8bb083fdf500a4..bdfc7ad1d32f170a3187d842221886c6712bceb6 100644 (file)
--- 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 0d66a140448e83be2055544682a00bcab230f411..ed7362ac722974d88bdc28b3873d3c80d8688b09 100644 (file)
--- 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 3828b337225e3d0d195fe7a31b0ed04ee428c5b8..d397ec7386fa931788a29a2fd9e0e31463f493c9 100644 (file)
--- 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='# '