only on people who have or ever had poboxes

[moira.git] / gen / aliases.sh

diff --git a/gen/aliases.sh b/gen/aliases.sh
index d6c2f8afbba2b692ab1328d27a666ad01da53226..3b3dd59bce49fdd7394e6a46ef94aef26a02f7b3 100644 (file)
--- a/gen/aliases.sh
+++ b/gen/aliases.sh
@@ -1,25 +1,26 @@
 #!/bin/sh
-SMS_MKCRED=47836474
-if [ `hostname`x != MITx ]; then
-       /bin/diff /usr/lib/aliases /usr/lib/aliases.new > /tmp/aliasdiff
-       fi
-/bin/cp /dev/null /usr/lib/aliases.new.dir
-/bin/cp /dev/null /usr/lib/aliases.new.pag
+PATH=/bin:/usr/ucb:/usr/bin
+
+MR_MKCRED=47836474
+
+cat /usr/lib/local-aliases >> /usr/lib/aliases.new
+diff /usr/lib/aliases /usr/lib/aliases.new > /tmp/aliasdiff
+cp /dev/null /usr/lib/aliases.new.dir
+cp /dev/null /usr/lib/aliases.new.pag
 /usr/lib/sendmail -bi -oA/usr/lib/aliases.new
 if [ $? != 0 ]; then
-       exit $SMS_MKCRED
+       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
-/bin/rm -f $0
+kill `ps ax | grep "accepting connections" | grep -v grep | awk '{print $1}'`
+mv /usr/lib/aliases /usr/lib/aliases.old
+mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
+mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
+mv /usr/lib/aliases.new /usr/lib/aliases
+mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
+mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
+/usr/lib/sendmail -bd -q30m
+
+rm -f $0
 exit 0
 
 # $Header$