aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neukirchen <chneukirchen@gmail.com>2016-08-08 16:01:06 +0200
committerChristian Neukirchen <chneukirchen@gmail.com>2016-08-08 16:01:06 +0200
commitd2d687478d055fa0acf2a6452cac324cc6bb54fb (patch)
tree3df33f515b20d38d0dc3fecdee89873603215a84
parentd453a5ac58e7e197e22a73ab9fc7ed24c213e383 (diff)
downloadmblaze-d2d687478d055fa0acf2a6452cac324cc6bb54fb.tar.gz
rename mcomp -> mcom, mrepl -> mrep
mcomp is in mtools already. mfwd will be added in the future.
-rw-r--r--Makefile4
-rw-r--r--README4
-rw-r--r--man/mblaze.74
-rw-r--r--man/mcom.1 (renamed from man/mcomp.1)16
-rw-r--r--man/mrep.11
-rwxr-xr-xmcom (renamed from mcomp)16
l---------mrep1
l---------mrepl1
8 files changed, 24 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 8004ca8..c1609c3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
ALL = maddr magrep mdate mdeliver mdirs mflag mgenmid mhdr minc mlist mmime mpick mscan msed mseq mshow msort mthread
-SCRIPT = mcolor mcomp mless mquote
+SCRIPT = mcolor mcom mless mquote
all: $(ALL)
@@ -40,7 +40,7 @@ install: FRC all
install -m0755 $(ALL) $(SCRIPT) $(DESTDIR)$(BINDIR)
ln -sf mless $(DESTDIR)$(BINDIR)/mnext
ln -sf mless $(DESTDIR)$(BINDIR)/mprev
- ln -sf mrepl $(DESTDIR)$(BINDIR)/mcomp
+ ln -sf mrep $(DESTDIR)$(BINDIR)/mcom
install -m0644 man/*.[0-9] $(DESTDIR)$(MANDIR)/man1
FRC:
diff --git a/README b/README
index 364a694..e85fab2 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ DESCRIPTION
mblaze consists of a set of Unix tools that each do one job:
maddr(1) to extract addresses from mail
magrep(1) to find mails matching a pattern
- mcomp(1) to write and send mail
+ mcom(1) to write and send mail
mdeliver(1) to deliver messages or import mailboxes
mdirs(1) to find Maildirs
mflag(1) to change flags (marks) of mail
@@ -24,7 +24,7 @@ DESCRIPTION
mlist(1) to list and filter mail messages
mmime(1) to create MIME messages
mpick(1) to filter mail
- mrepl(1) to reply to mail
+ mrep(1) to reply to mail
mscan(1) to generate single line summaries of mail
msed(1) to manipulate mail headers
mseq(1) to manipulate mail sequences
diff --git a/man/mblaze.7 b/man/mblaze.7
index 2f3133c..6e30c6b 100644
--- a/man/mblaze.7
+++ b/man/mblaze.7
@@ -20,7 +20,7 @@ consists of a set of Unix tools that each do one job:
to extract addresses from mail
.It Xr magrep 1
to find mails matching a pattern
-.It Xr mcomp 1
+.It Xr mcom 1
to write and send mail
.It Xr mdeliver 1
to deliver messages or import mailboxes
@@ -43,7 +43,7 @@ to list and filter mail messages
to create MIME messages
.It Xr mpick 1
to filter mail
-.It Xr mrepl 1
+.It Xr mrep 1
to reply to mail
.It Xr mscan 1
to generate single line summaries of mail
diff --git a/man/mcomp.1 b/man/mcom.1
index 3eb129b..5e4a15e 100644
--- a/man/mcomp.1
+++ b/man/mcom.1
@@ -1,24 +1,24 @@
.Dd July 22, 2016
-.Dt MCOMP 1
+.Dt MCOM 1
.Os
.Sh NAME
-.Nm mcomp ,
-.Nm mrepl
+.Nm mcom ,
+.Nm mrep
.Nd compose new, reply to, and send mail
.Sh SYNOPSIS
-.Nm mcomp
+.Nm mcom
.Op Ar recipient
-.Nm mrepl
+.Nm mrep
.Ar msg
.Sh DESCRIPTION
-.Nm mcomp
+.Nm mcom
creates a new draft mail and runs an editor.
After editing, a loop is started where the user can re-edit, send or
cancel the mail.
.Pp
-.Nm mrepl
+.Nm mrep
behaves like
-.Nm mcomp
+.Nm mcom
but fills the draft such that the mail will be a reply to the message
.Ar msg .
See
diff --git a/man/mrep.1 b/man/mrep.1
new file mode 100644
index 0000000..04eb765
--- /dev/null
+++ b/man/mrep.1
@@ -0,0 +1 @@
+.so man1/mcom.1
diff --git a/mcomp b/mcom
index a98aa93..72269a8 100755
--- a/mcomp
+++ b/mcom
@@ -1,5 +1,5 @@
#!/bin/sh
-# mcomp [TO] - compose mail
+# mcom [TO] - compose mail
commajoin() {
sed ':a;N;s/\n/, /;$!b a'
@@ -37,7 +37,7 @@ fi
{
case "$0" in
- *mcomp*)
+ *mcom*)
echo -n "To: $1"
[ "$#" -ge 1 ] && shift
for rcpt; do
@@ -55,7 +55,7 @@ fi
echo
echo
;;
- *mrepl*)
+ *mrep*)
[ "$#" -eq 0 ] && set -- .
to=$(mhdr -h reply-to "$1")
[ -z "$to" ] && to=$(mhdr -h from "$1")
@@ -111,11 +111,11 @@ while :; do
fi
exit 0
else
- echo "mcomp: sendmail failed, kept draft $draft"
+ echo "mcom: sendmail failed, kept draft $draft"
exit 2
fi
else
- echo "mcomp: re-run mmime first."
+ echo "mcom: re-run mmime first."
c=
fi
else
@@ -128,17 +128,17 @@ while :; do
fi
exit 0
else
- echo "mcomp: sendmail failed, kept draft $draft"
+ echo "mcom: sendmail failed, kept draft $draft"
exit 2
fi
else
- echo "mcomp: message needs to be MIME-encoded first."
+ echo "mcom: message needs to be MIME-encoded first."
c=
fi
fi
;;
c|cancel)
- echo "mcomp: cancelled draft $draft"
+ echo "mcom: cancelled draft $draft"
exit 1
;;
m|mime)
diff --git a/mrep b/mrep
new file mode 120000
index 0000000..5574ca9
--- /dev/null
+++ b/mrep
@@ -0,0 +1 @@
+mcom \ No newline at end of file
diff --git a/mrepl b/mrepl
deleted file mode 120000
index 0789f5f..0000000
--- a/mrepl
+++ /dev/null
@@ -1 +0,0 @@
-mcomp \ No newline at end of file