From d06f768645f9e8c54443a87389ff0dde21277fa1 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Sat, 29 Jun 2019 17:58:22 -0400
Subject: Clean up 1sh prompt setting
---
home/.config/1sh/env.sh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/home/.config/1sh/env.sh b/home/.config/1sh/env.sh
index 0c645e64..7b87c9d3 100644
--- a/home/.config/1sh/env.sh
+++ b/home/.config/1sh/env.sh
@@ -37,11 +37,17 @@ if [ "$(uname)" = 'Linux' ]; then
alias ls='ls --color=auto' grep='grep --color'
fi
+PS0=$'\n'
+PS1='\$ '
+RPS1="${SSH_CLIENT:+\h:}\w"
+
af0=$(tput setaf 0 || tput AF 0)
af7=$(tput setaf 7 || tput AF 7)
sgr0=$(tput sgr0 || tput me)
+tsl=$'\e]0;'
+fsl=$'\a'
PSlit=$'\1'
-[ "${TERM%-*}" = 'xterm' ] && PS0=$'\e]0;\\W\a\n' || PS0=$'\n'
-PS1="${PSlit}${af7}${PSlit}\\\$${PSlit}${sgr0}${PSlit} "
-RPS1="${PSlit}${af0}${PSlit}# ${PSlit}${af7}${PSlit}\\w${PSlit}${sgr0}${PSlit}"
+PS1="${PSlit}${af7}${PSlit}${PS1% }${PSlit}${sgr0}${PSlit} "
+RPS1="${PSlit}${af0}${PSlit}# ${PSlit}${af7}${PSlit}${RPS1}${PSlit}${sgr0}${PSlit}"
+[ "${TERM%-*}" = 'xterm' ] && PS0="${tsl}${SSH_CLIENT:+\h:}\W${fsl}${PS0}"
--
cgit 1.4.1