From d34aa021246c51eb8bdfa9d70855dc140cf964f6 Mon Sep 17 00:00:00 2001
From: Mitch Riedstra <mitch@riedstra.us>
Date: Wed, 7 Mar 2018 21:08:09 -0500
Subject: Remove newline from prompt and add 256color variant for root

---
 mkshrc | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'mkshrc')

diff --git a/mkshrc b/mkshrc
index fb442ea..13379a6 100644
--- a/mkshrc
+++ b/mkshrc
@@ -42,13 +42,11 @@ precmd() {
 	(( e )) && print -n "$e|"
 }
 set_ps1() {
-		PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${USER_C}${USER:=$(id -un)}@$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
-${END_P} '
+		PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${USER_C}${USER:=$(id -un)}@$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C} ${END_P} '
 		export PS1;
 }
 set_root_ps1() {
-PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${HOST_C}$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C}
-${END_P} '
+PS1='$(precmd)${BG}${ACCENT_C}${ACCENT_P}${HOST_C}$(hostname)${ACCENT_C}${ACCENT_P} ${ACCENT_P}${PATH_C}${PWD:-?}${ACCENT_C}${ACCENT_P}${END_C} ${END_P} '
 export PS1;
 }
 # RED: 31, GREEN: 32, YELLOW: 33, BLUE: 34, MAGENTA: 35, CYAN: 36, WHITE: 37, GREY 38. and No color which is 0.
@@ -57,13 +55,25 @@ set_prompt() {
 		# Previously
 		# Red for root, and no username 
 		# PS1="$(hostname) \$PWD
-		BG=""
-		ACCENT_C=""
-		ACCENT_P="|"
-		HOST_C=""
-		PATH_C=""
-		END_C=""
-		END_P="#"
+		echo $TERM | grep "256color$" > /dev/null 2>&1
+		if [ $? -eq 0 ] ; then
+			BG=""
+			ACCENT_C=""
+			ACCENT_P="|"
+			HOST_C=""
+			PATH_C=""
+			END_C=""
+			END_P="$(printf '\n#')"
+			set_root_ps1
+		else
+			BG=""
+			ACCENT_C=""
+			ACCENT_P="|"
+			HOST_C=""
+			PATH_C=""
+			END_P="$(printf '\n#')"
+			END_P="#"
+		fi
 		set_root_ps1
 	else	
 		# Previously
@@ -76,7 +86,7 @@ set_prompt() {
 			USER_C=""
 			PATH_C=""
 			END_C=""
-			END_P="≈"
+			END_P="$(printf '\n≈')"
 		else
 			BG=""
 			ACCENT_C=""
@@ -84,7 +94,7 @@ set_prompt() {
 			USER_C=""
 			PATH_C=""
 			END_C=""
-			END_P="$"
+			END_P="$(printf '\n$')"
 		fi
 		set_ps1
 	fi
-- 
cgit v1.2.3