New database and column names for Moira2.

[moira.git] / gen / mailhub.sh

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index d4ef6ebf9d5b168a6ba249da607f314816039b0a..56423c84530d9340917148bc3b65b60159369813 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -1,22 +1,26 @@
 #!/bin/sh
+PATH=/bin:/usr/ucb:/usr/bin
+
 MR_MKCRED=47836474
-/bin/cp /dev/null /u1/usr/lib/aliases.new.dir
-/bin/cp /dev/null /u1/usr/lib/aliases.new.pag
+
+cat /u1/usr/lib/local-aliases >> /u1/usr/lib/aliases.new
+cp /dev/null /u1/usr/lib/aliases.new.dir
+cp /dev/null /u1/usr/lib/aliases.new.pag
 /usr/lib/sendmail -bi -oA/u1/usr/lib/aliases.new
 if [ $? != 0 ]; then
        exit $MR_MKCRED
        fi
 
-kill `/bin/ps ax | /bin/grep "accepting connections" | /bin/grep -v grep | /bin/awk '{print $1}'`
-/bin/mv /u1/usr/lib/aliases /u1/usr/lib/aliases.old
-/bin/mv /u1/usr/lib/aliases.dir /u1/usr/lib/aliases.old.dir
-/bin/mv /u1/usr/lib/aliases.pag /u1/usr/lib/aliases.old.pag
-/bin/mv /u1/usr/lib/aliases.new /u1/usr/lib/aliases
-/bin/mv /u1/usr/lib/aliases.new.dir /u1/usr/lib/aliases.dir
-/bin/mv /u1/usr/lib/aliases.new.pag /u1/usr/lib/aliases.pag
+kill `ps ax | grep "accepting connections" | grep -v grep | awk '{print $1}'`
+mv /u1/usr/lib/aliases /u1/usr/lib/aliases.old
+mv /u1/usr/lib/aliases.dir /u1/usr/lib/aliases.old.dir
+mv /u1/usr/lib/aliases.pag /u1/usr/lib/aliases.old.pag
+mv /u1/usr/lib/aliases.new /u1/usr/lib/aliases
+mv /u1/usr/lib/aliases.new.dir /u1/usr/lib/aliases.dir
+mv /u1/usr/lib/aliases.new.pag /u1/usr/lib/aliases.pag
 /usr/lib/sendmail -bd -q30m
 
-/bin/rm -f $0
+rm -f $0
 exit 0
 
 # $Header$