From 7be8fcd1a5cccf51471978d8ca8c5586f06c134b Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Wed, 23 Aug 2017 00:22:58 +0100 Subject: [PATCH] mhmail: Turn sh's else-if into elif. --- uip/mhmail | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/uip/mhmail b/uip/mhmail index 27695709..09625afc 100755 --- a/uip/mhmail +++ b/uip/mhmail @@ -235,21 +235,19 @@ if [ $resent -eq 0 ]; then header="$header " message_file="$tmpfile" +elif [ $use_send -eq 0 ]; then + postsendargs="${postsendargs:+$postsendargs }-dist" + message_file="$tmpfile" else - if [ $use_send -eq 0 ]; then - postsendargs="${postsendargs:+$postsendargs }-dist" - message_file="$tmpfile" - else - #### When resending with send, tmpfile will just contain the - #### Resent- header fields. "$tmpfileresent" will contain - #### the message that is being resent. - tmpfileresent=`"${nmhlibexecdir}/mkstemp" -d "$tmpdir" -p mhmail-resent` - [ $? -ne 0 ] && die "mhmail: failed to create temporary file in $tmpdir" - mhdist=1; export mhdist - mhaltmsg=$tmpfileresent; export mhaltmsg - message_file="$tmpfileresent" - printf '' >"$message_file" || exit 2 - fi + #### When resending with send, tmpfile will just contain the + #### Resent- header fields. "$tmpfileresent" will contain + #### the message that is being resent. + tmpfileresent=`"${nmhlibexecdir}/mkstemp" -d "$tmpdir" -p mhmail-resent` + [ $? -ne 0 ] && die "mhmail: failed to create temporary file in $tmpdir" + mhdist=1; export mhdist + mhaltmsg=$tmpfileresent; export mhaltmsg + message_file="$tmpfileresent" + printf '' >"$message_file" || exit 2 fi trap "rm -f '$tmpfile' $tmpfilebackup ${tmpfileresent:+'$tmpfileresent'}" 0 -- 2.56.0