diff options
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | man/mcom.1 | 2 | ||||
| -rw-r--r-- | man/mseq.1 | 2 | ||||
| -rwxr-xr-x | mcom | 20 |
4 files changed, 15 insertions, 18 deletions
diff --git a/README b/README index d5b86d5..e819615 100644 --- a/README +++ b/README @@ -87,11 +87,10 @@ EXAMPLES As usual with pipes, the sky is the limit. CONCEPTS - mblaze deals with messages (which are files), folders (which are - Maildir folders), sequences (which are newline-separated lists of - messages, possibly persisted on disk in - ${MBLAZE:-$HOME/.mblaze}/seq), and the current message - (kept as a symlink in ${MBLAZE:-$HOME/.mblaze}/cur). + mblaze deals with messages (which are files), folders (which are Maildir + folders), sequences (which are newline-separated lists of messages, + possibly persisted on disk in ~/.mblaze/seq), and the current message + (kept as a symlink in ~/.mblaze/cur). Messages in the persisted sequence can be referred to using special syntax as explained in mmsg(7). diff --git a/man/mcom.1 b/man/mcom.1 index 72352c2..18a4dda 100644 --- a/man/mcom.1 +++ b/man/mcom.1 @@ -50,7 +50,7 @@ Editor used to compose mail. .It Ev MBLAZE Directory containing mblaze configuration. (Default: -.Pa $HOME/.mblaze) +.Pa $HOME/.mblaze ) .El .Sh FILES .Bl -tag -width Ds diff --git a/man/mseq.1 b/man/mseq.1 index 604b46a..07f33aa 100644 --- a/man/mseq.1 +++ b/man/mseq.1 @@ -71,7 +71,7 @@ and exit. .It Ev MBLAZE Directory containing mblaze configuration. (Default: -.Pa $HOME/.mblaze) +.Pa $HOME/.mblaze ) .It Ev MAILCUR Symbolic link referring to the current message. (Default: diff --git a/mcom b/mcom index 1be4da0..e7d8b40 100755 --- a/mcom +++ b/mcom @@ -19,7 +19,7 @@ msgdate() { } MBLAZE=${MBLAZE:-$HOME/.mblaze} -outbox=$(mhdr -h outbox $MBLAZE/profile) +outbox=$(mhdr -h outbox "$MBLAZE/profile") if [ -z "$outbox" ]; then i=0 while [ -f "snd.$i" ]; do @@ -44,9 +44,9 @@ fi echo "Cc: " echo "Bcc: " echo "Subject: " - from=$(mhdr -h local-mailbox $MBLAZE/profile) + from=$(mhdr -h local-mailbox "$MBLAZE/profile") [ "$from" ] && echo "From: $from" - cat $MBLAZE/headers 2>/dev/null + cat "$MBLAZE/headers" 2>/dev/null msgid msgdate echo @@ -60,7 +60,7 @@ fi echo "Cc: $(mhdr -d -A -h to:cc: "$1" | commajoin)" echo "Bcc: " echo "Subject: Re: $(mscan -f '%S' "$1")" - cat $MBLAZE/headers 2>/dev/null + cat "$MBLAZE/headers" 2>/dev/null mid=$(mhdr -h message-id "$1") if [ "$mid" ]; then echo -n "References:" @@ -78,17 +78,15 @@ fi echo esac - if [ -f $MBLAZE/signature ]; then - SIGNATURE=$MBLAZE/signature - elif [ -f $HOME/.mblaze/signature ]; then - SIGNATURE=$HOME/.mblaze/signature + if [ -f "$MBLAZE/signature" ]; then + SIGNATURE="$MBLAZE/signature" elif [ -f ~/.signature ]; then - SIGNATURE=$HOME/.signature + SIGNATURE="$HOME/.signature" fi - if [ ! -z $SIGNATURE ]; then + if [ -n "$SIGNATURE" ]; then printf '%s\n' '-- ' - cat $SIGNATURE + cat "$SIGNATURE" fi } >$draft |