From 1442d63dfaee897813ba777bf511c0afa8994279 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Sun, 5 Jul 2009 17:49:24 +0200
Subject: screen magic only in screen, removed newline from prompt

---
 bashrc/common/prompt.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bashrc/common/prompt.sh b/bashrc/common/prompt.sh
index 5dc01ca..7a66718 100644
--- a/bashrc/common/prompt.sh
+++ b/bashrc/common/prompt.sh
@@ -96,8 +96,11 @@ __make_prompt() {
 	s="${s} "
     fi
 
-    export PS1="${PS1UH} ${PS1BO}${PS1R}${PS1F}${PS1BC} ${PS1D} ${s}\n${PS1P}"
-    echo -ne "\ek$(id -un)@$(hostname)\e\\"
+    export PS1="${PS1UH} ${PS1BO}${PS1R}${PS1F}${PS1BC} ${PS1D} ${s}${PS1P}"
+
+    if [ ${TERM} = "screen" ]; then
+	echo -ne "\ek$(id -un)@$(hostname)\e\\"
+    fi
 }
 
 export PROMPT_COMMAND="__make_prompt"
-- 
cgit v1.2.3