--- profile.orig	2003-04-25 00:09:56.000000000 -0400
+++ profile	2003-04-25 07:09:50.000000000 -0400
@@ -3,21 +3,21 @@
 
 if [ -e "/etc/profile.env" ]
 then
-	source /etc/profile.env
+	. /etc/profile.env
 fi
 
 #077 would be more secure, but 022 is generally quite realistic
 umask 022
 
-if [ `/usr/bin/whoami` = 'root' ]
+if [ "$LOGNAME" = root ]
 then
-	if [ "$SHELL" = '/bin/bash' ] || [ "$SHELL" = '/bin/sh' ]
+	if [ "$BASH" ]
 	then
 		export PS1='\[\033[01;31m\]\h \[\033[01;34m\]\W \$ \[\033[00m\]'
 	fi
 	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
 else
-	if [ "$SHELL" = '/bin/bash' ] || [ "$SHELL" = '/bin/sh' ]
+	if [ "$BASH" ]
 	then
 		export PS1='\[\033[01;32m\]\u@\h \[\033[01;34m\]\W \$ \[\033[00m\]'
 	fi
@@ -25,6 +25,8 @@
 fi
 unset ROOTPATH
 
-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
+if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]
+then
 	export INPUTRC="/etc/inputrc"
 fi
+