From 6ebfb411cb1a4884846f031061924f1597e838e1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 11 Apr 2014 17:31:35 +0100
Subject: [PATCH] swap argument order, support spaces in email address list

---
 notify       | 2 +-
 via-email    | 9 +++++----
 via-irctopic | 2 +-
 via-sms      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/notify b/notify
index 833d46e..83bf608 100755
--- a/notify
+++ b/notify
@@ -36,7 +36,7 @@ while read method data; do
 	printf >&2 "$method"
 	exec 3>&2 2>&1
 	set -x
-	./"via-$method" $data "$msg" 2>&1
+	./"via-$method" "$msg" $data 2>&1
 	rc=$?
 	set +x
 	exec 2>&3 3>&-
diff --git a/via-email b/via-email
index 2f1bd46..34b1d7f 100755
--- a/via-email
+++ b/via-email
@@ -1,10 +1,11 @@
-#!/bin/sh
-rcpt="$1"
-msg="$2"
+#!/bin/bash
+msg="$1"; shift
+rcpts="$*";
 ssh -vt ijackson@tunnel.chiark.greenend.org.uk \
  /usr/lib/sendmail -oem -odb -oi -t <<END
-To: $rcpt
+To: ${rcpts// /, }
 Subject: $msg
+User-Agent: post-pizza notification robot
 
 $msg
 
diff --git a/via-irctopic b/via-irctopic
index 8dadc0d..f67dba3 100755
--- a/via-irctopic
+++ b/via-irctopic
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 use strict;
 die unless @ARGV==4;
-our ($server,$port,$channel,$msg) = @ARGV;
+our ($msg,$server,$port,$channel) = @ARGV;
 
 chdir "../ircbot.git" or die $!;
 
diff --git a/via-sms b/via-sms
index 22f5a15..2dc4546 100755
--- a/via-sms
+++ b/via-sms
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -e
-rcpt="$1"
-msg="$2"
+msg="$1"
+rcpt="$2"
 gammu sendsms TEXT "$rcpt" -text "$msg"
-- 
2.30.2