commit 7e3f5b319f763d518fe7957da48c838be1bf2c2b
parent ed44d4eb664c444ab922294362fef7c0de35267d
Author: parazyd <parazyd@dyne.org>
Date: Tue, 18 Dec 2018 09:13:39 -0500
Change style in rpsend.
Diffstat:
| M | bin/rpsend | | | 68 | ++++++++++++++++++++++++++++++++++---------------------------------- |
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/bin/rpsend b/bin/rpsend
@@ -9,8 +9,8 @@ profile="${RPPROFILE:-$HOME/.rp/default}"
usage() {
printf " * usage: %s [-n] [-v] [-l] [-a] < email\\n" "$(basename "$0")"
printf "\\t-n: dry run\\n"
- printf "\\t-l: list outbox\\n"
printf "\\t-v: verbose list output\\n"
+ printf "\\t-l: list outbox\\n"
printf "\\t-a: send all\\n"
exit 1
}
@@ -28,33 +28,33 @@ listoutbox() {
for i in "$@"; do
case "$i" in
- -n)
- dryrun="--pretend"
- shift 1
- continue
- ;;
- -v)
- verbose="true"
- shift 1
- continue
- ;;
- -l)
- listoutbox
- exit 0
- ;;
- -a)
- echo " * sending all queued emails"
- for j in $(rpsend -l); do
- rpsend < "$j" && { [ -z "$dryrun" ] && rm -f "$j" ; }
- done
- exit $?
- ;;
- *)
- usage
- ;;
+ -n)
+ dryrun="--pretend"
+ ;;
+ -v)
+ verbose="true"
+ ;;
+ -l)
+ list="true"
+ ;;
+ -a)
+ echo " * sending all queued emails"
+ for j in $(rpsend -l); do
+ rpsend < "$j" && { [ -z "$dryrun" ] && rm -f "$j" ; }
+ done
+ exit $?
+ ;;
+ *)
+ usage
+ ;;
esac
done
+if [ -n "$list" ]; then
+ listoutbox
+ exit 0
+fi
+
email="$(cat)"
rnet="$(rpheaders rnet < "$profile"/config)"
@@ -73,12 +73,12 @@ served="$(rputil -e getfpr "$rnet")"
if [ "$known" != "$served" ]; then
cat <<EOF
- * known fingerprint: $known
- * served fingerprint: $served
+* known fingerprint: $known
+* served fingerprint: $served
- * server fingerprint mismatch!"
- * the known one is different, this may be mitm
- * to trust the new one, edit or delete $profile/smtp-fingerprint
+* server fingerprint mismatch!"
+* the known one is different, this may be mitm
+* to trust the new one, edit or delete $profile/smtp-fingerprint
EOF
exit 1
fi
@@ -103,10 +103,10 @@ _dest="$(echo "$email" | rpheaders To)"
_cc="$(echo "$email" | rpheaders Cc)"
cat <<EOF
- * subject: $_subj
- * to: $_dest
- * cc: $_cc
- * sending $(rputil -e humansize "${#email}") over the network
+* subject: $_subj
+* to: $_dest
+* cc: $_cc
+* sending $(rputil -e humansize "${#email}") over the network
EOF
cat <<EOF | msmtp $dryrun -C "$msmtpcfg" -t -X "$profile/tmp/msmtp.log"
