don't conditionalize on hostname; append local aliases file

diff --git a/gen/aliases.sh b/gen/aliases.sh
index 22a29ff4bd1e616ce0c24c15afe4d9df97eea3e1..0fa007c9e6dd33f20b9ca3c0ffa0f2ede3e7e418 100644 (file)
--- a/gen/aliases.sh
+++ b/gen/aliases.sh
@@ -1,24 +1,22 @@
 #!/bin/sh
 MR_MKCRED=47836474
-if [ `hostname`x != MITx ]; then
-       /bin/diff /usr/lib/aliases /usr/lib/aliases.new > /tmp/aliasdiff
-       fi
+cat /usr/lib/local-aliases >> /usr/lib/aliases.new
+/bin/diff /usr/lib/aliases /usr/lib/aliases.new > /tmp/aliasdiff
 /bin/cp /dev/null /usr/lib/aliases.new.dir
 /bin/cp /dev/null /usr/lib/aliases.new.pag
 /usr/lib/sendmail -bi -oA/usr/lib/aliases.new
 if [ $? != 0 ]; then
        exit $MR_MKCRED
        fi
-if [ `hostname`x = MITx ]; then
-       kill `/bin/ps ax | /bin/grep "accepting connections" | /bin/grep -v grep | /bin/awk '{print $1}'`
-       /bin/mv /usr/lib/aliases /usr/lib/aliases.old
-       /bin/mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
-       /bin/mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
-       /bin/mv /usr/lib/aliases.new /usr/lib/aliases
-       /bin/mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
-       /bin/mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
-       /usr/lib/sendmail -bd -q30m
-       fi
+kill `/bin/ps ax | /bin/grep "accepting connections" | /bin/grep -v grep | /bin/awk '{print $1}'`
+/bin/mv /usr/lib/aliases /usr/lib/aliases.old
+/bin/mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
+/bin/mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
+/bin/mv /usr/lib/aliases.new /usr/lib/aliases
+/bin/mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
+/bin/mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
+/usr/lib/sendmail -bd -q30m
+
 /bin/rm -f $0
 exit 0