/etc/shrc: Re-organize PS1 setting

1 files changed, 6 insertions, 13 deletions

diff --git a/etc/shrc b/etc/shrc
index 4db8360..a4f8025 100644
--- a/etc/shrc
+++ b/etc/shrc
@@ -2,23 +2,16 @@
 #
 # System-wide .shrc file for sh(1).
 
-ll(){ ls -lp ${1+"$@"}; }
-
 case "$-" in *i*)
 	set -o emacs
 
-	PS1=
-	/bin/test -z "${HOST}" && HOST="$(hostname)"
-	case "$SHELL" in
-	*bash)	PS1=${HOST%%.*} ;;
-	*ksh)	PS1='

'${HOST%%.*} ;;
-	*)	PS1='${HOST%%.*}' ;;
-	esac
-	/bin/test "$(whoami)" = root && PS1=$PS1'# ' || PS1=$PS1'$ '
+	ll(){ ls -lp ${1+"$@"}; }
 
-        case "$TERM" in
-        screen*) PS1='$(safetitle "$PWD")'$PS1 ;;
-        esac
+	PS1=
+	/bin/test -z "${HOST}" && HOST=$(hostname)
+	PS1='${HOST%%.*}'
+	/bin/test x"$(whoami)" = x"root" && PS1=$PS1'# ' || PS1=$PS1'$ '
+        case $TERM in screen*) PS1='$(safetitle "$PWD")'$PS1 ;; esac
 
 	# This file is used by shells that might not support
 	# set -o tabcomplete, so check before trying to use it.