From b5f65921f346e6b4335f77e457ac5bcae0ab9d67 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sat, 11 Feb 2006 23:38:55 +0000
Subject: various cleanup

---
 src/cmd/upas/misc/mail.rc    |  2 +-
 src/cmd/upas/misc/mkfile     | 19 +++++++------------
 src/cmd/upas/misc/omail.rc   | 14 --------------
 src/cmd/upas/misc/qmail      |  4 ++--
 src/cmd/upas/misc/remotemail |  4 ++--
 src/cmd/upas/misc/rewrite    |  6 +++---
 6 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100755 src/cmd/upas/misc/omail.rc

(limited to 'src/cmd/upas/misc')

diff --git a/src/cmd/upas/misc/mail.rc b/src/cmd/upas/misc/mail.rc
index 6913d743..b079e2d8 100755
--- a/src/cmd/upas/misc/mail.rc
+++ b/src/cmd/upas/misc/mail.rc
@@ -1,4 +1,4 @@
-#!/bin/rc
+#!/usr/local/plan9/bin/rc
 switch($#*){
 case 0
 	exec upas/nedmail
diff --git a/src/cmd/upas/misc/mkfile b/src/cmd/upas/misc/mkfile
index 0bbd8a5a..eeb76965 100644
--- a/src/cmd/upas/misc/mkfile
+++ b/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\
diff --git a/src/cmd/upas/misc/omail.rc b/src/cmd/upas/misc/omail.rc
deleted file mode 100755
index ed64f38c..00000000
--- a/src/cmd/upas/misc/omail.rc
+++ /dev/null
@@ -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 $*
-}
diff --git a/src/cmd/upas/misc/qmail b/src/cmd/upas/misc/qmail
index 77a3d228..de2f0361 100755
--- a/src/cmd/upas/misc/qmail
+++ b/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
diff --git a/src/cmd/upas/misc/remotemail b/src/cmd/upas/misc/remotemail
index 312ee587..9059d3f4 100755
--- a/src/cmd/upas/misc/remotemail
+++ b/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 $*
diff --git a/src/cmd/upas/misc/rewrite b/src/cmd/upas/misc/rewrite
index fd724eb1..a4d1719d 100644
--- a/src/cmd/upas/misc/rewrite
+++ b/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'"
-- 
cgit v1.2.3