shrc: Re-arrange prompt setup

1 files changed, 8 insertions, 7 deletions

diff --git a/etc/shrc b/etc/shrc
index 9d61efd..c6aff47 100644
--- a/etc/shrc
+++ b/etc/shrc
@@ -7,16 +7,17 @@ ll(){ ls -lp ${1+"$@"}; }
 case "$-" in *i*)
 	set -o emacs
 
-	# configure prompt
-	case "$0,$TERM,$XTERM_SHELL" in
-	*ksh,screen,*)	PS1='$(safetitle "$PWD")' ;;
-	*ksh,*,/*)	PS1='


]0;$PWD
' ;;
-	*)		PS1= ;;
-	esac
 	/bin/test -z "${HOST}" && HOST="$(hostname)"
-	PS1=$PS1${HOST%%.*}
+	PS1='

'${HOST%%.*}
 	/bin/test "$(whoami)" = root && PS1=$PS1'# ' || PS1=$PS1'$ '
 
+	# change terminal title to working directory on prompt
+	case "$0,$TERM,$XTERM_SHELL" in
+	*ksh,screen,*)	PS1=$PS1'$(safetitle "$PWD")' ;;
+	*ksh,*,/*)	PS1=$PS1'
]0;$PWD
' ;;
+	*)		;;
+	esac
+
 	# This file is used by shells that might not support
 	# set -o tabcomplete, so check before trying to use it.
 	( set -o tabcomplete 2>/dev/null ) && set -o tabcomplete