Don't set "ME" variable, use "HOSTNAME" instead

diff --git a/sys/bashrc b/sys/bashrc
index b65ff999af1d3101596266a03566331fa24e0565..09947a8cd88028ebc45958c8ecb6fbfba80c0f91 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -184,6 +184,6 @@ esac
 # Source local files, if readable
 [ -r "/etc/bashrc.local" ] && source /etc/bashrc.local
 [ -r "/etc/bash.bashrc.local" ] && source /etc/bash.bashrc.local
-[ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
+[ -r "/var/lib/$HOSTNAME/bash.bashrc" ] && source /var/lib/$HOSTNAME/bash.bashrc
 
 # -eof-

diff --git a/sys/profile b/sys/profile
index bd6cf58d38bca01d56abeffb30c11d1b8488231d..2e4f778542a814156d22469bb080eb3eeba9860f 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -99,8 +99,8 @@ fi
 [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
 
 # get my own hostname
-ME=`hostname 2>/dev/null`
-export ME
+[ -n "$HOSTNAME" ] || HOSTNAME=`hostname 2>/dev/null`
+export HOSTNAME
 
 # Move Xauthority file to local storage, so that sudo et all work
 if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then
@@ -125,7 +125,7 @@ if [ -d /etc/profile.d -o -d /usr/local/etc/profile.d ]; then
 fi
 
 # read local profile, if available
-[ -r "/var/lib/${ME}/profile" ] && . /var/lib/${ME}/profile
+[ -r "/var/lib/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
 # Setup some directories to use local storage (no NFS)
 [ -d "/usr/local/home/$LOGNAME" ] \
@@ -144,8 +144,8 @@ type tset >/dev/null 2>&1 && eval `tset -s -Q`
 
 # generic shell prompt
 [ "$LOGNAME" = "root" ] \
-       && PS1="<$ME> # " \
-       || PS1="<$ME> \$ "
+       && PS1="<$HOSTNAME> # " \
+       || PS1="<$HOSTNAME> \$ "
 
 # Reminders (once every 60 minutes)
 if [ -z `find ~/.last_reminder -mmin 1 2>/dev/null` ]; then