various cleanup

src/cmd/upas/misc/mail.rc

@@ -1,4 +1,4 @@
-#!/bin/rc
+#!/usr/local/plan9/bin/rc
 switch($#*){
 case 0
 	exec upas/nedmail

src/cmd/upas/misc/mkfile

@@ -2,24 +2,19 @@
 RCFILES=mail.rc\
 
 all:Q:
-	;
+	#
 
 installall:Q:	install
-	;
+	#
 
-install:V:
-	cp mail.rc /rc/bin/mail
-
-safeinstall:V:
-	cp mail.rc /rc/bin/mail
-
-safeinstallall:V:
-	cp mail.rc /rc/bin/mail
+install safeinstall safeinstallall:V:
+	cp mail.rc $PLAN9/bin/mail
 
 clean:Q:
-	;
+	#
+
 nuke:V:
-	rm /rc/bin/mail
+	rm $PLAN9/bin/mail
 
 UPDATE=\
 	gone.fishing\

src/cmd/upas/misc/omail.rc

@@ -1,14 +0,0 @@
-#!/bin/rc
-switch($#*){
-case 0
-	exec upas/edmail -m
-}
-
-switch($1){
-case -F* -m* -f* -r* -p* -e* -c* -D*
-	exec upas/edmail -m $*
-case '-#'* -a*
-	exec upas/sendmail $*
-case *
-	exec upas/sendmail $*
-}

src/cmd/upas/misc/qmail

@@ -1,6 +1,6 @@
-#!/bin/rc
+#!/usr/local/plan9/bin/rc
 sender=$1
 shift
 addr=$1
 shift
-qer /mail/queue mail $sender $addr $* && runq /mail/queue /mail/lib/remotemail
+qer $PLAN9/mail/queue mail $sender $addr $* && runq $PLAN9/mail/queue $PLAN9/mail/lib/remotemail

src/cmd/upas/misc/remotemail

@@ -1,7 +1,7 @@
-#!/bin/rc
+#!/usr/local/plan9/bin/rc
 shift
 sender=$1
 shift
 addr=$1
 shift
-/bin/upas/smtp -g research.research.bell-labs.com $addr $sender $*
+upas/smtp -g yourgateway $addr $sender $*

src/cmd/upas/misc/rewrite

@@ -2,8 +2,8 @@
 pOsTmAsTeR	alias		postmaster
 
 # local mail
-[^!@]+		translate	"/bin/upas/aliasmail '&'"
-local!(.*)	>>		/mail/box/\1/mbox
+[^!@]+		translate	"upas/aliasmail '&'"
+local!(.*)	>>		$PLAN9/mail/box/\1/mbox
 \l!(.*)		alias		\1
 (helix|helix.bell-labs.com)!(.*)	alias		\2
 
@@ -17,4 +17,4 @@ local!(.*)	>>		/mail/box/\1/mbox
 ([^@]+)@([^@]+)		alias	\2!\1
 
 # /mail/lib/remotemail will take care of gating to systems we don't know
-([^!]*)!(.*) 		| 		"/mail/lib/qmail '\s' 'net!\1'" "'\2'"
+([^!]*)!(.*) 		| 		"$PLAN9/mail/lib/qmail '\s' 'net!\1'" "'\2'"