From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <www-data@comics.unina.it>
Received: from svn.comics.unina.it (unknown [143.225.229.147])
	by huchra.bufferbloat.net (Postfix) with ESMTP id 80F91201736
	for <bismark-commits@lists.bufferbloat.net>;
	Fri, 27 May 2011 04:15:53 -0700 (PDT)
Received: from www-data by svn.comics.unina.it with local (Exim 4.69)
	(envelope-from <www-data@comics.unina.it>) id 1QPu6q-0002pI-OW
	for bismark-commits@lists.bufferbloat.net;
	Fri, 27 May 2011 12:17:36 +0200
To: bismark-commits@lists.bufferbloat.net
From: walter@svn.comics.unina.it
Message-Id: <E1QPu6q-0002pI-OW@svn.comics.unina.it>
Date: Fri, 27 May 2011 12:17:36 +0200
X-Mailman-Approved-At: Fri, 27 May 2011 09:25:59 -0700
Subject: [Bismark-commits] rev 353 - trunk/server/scripts
X-BeenThere: bismark-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Commit log for the bismark source code
	<bismark-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/bismark-commits>
List-Post: <mailto:bismark-commits@lists.bufferbloat.net>
List-Help: <mailto:bismark-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2011 11:15:53 -0000

Author: walter
Date: 2011-05-27 12:17:36 +0200 (Fri, 27 May 2011)
New Revision: 353

Modified:
   trunk/server/scripts/bdm
Log:
aggregated notification fix

Modified: trunk/server/scripts/bdm
===================================================================
--- trunk/server/scripts/bdm	2011-05-27 06:05:25 UTC (rev 352)
+++ trunk/server/scripts/bdm	2011-05-27 10:17:36 UTC (rev 353)
@@ -343,12 +343,20 @@
 # $2 = message
 function sendmail ()
 {
-	[ ${2:0:1} == "@" ] && msg=$(cat ${2:1}) || msg=$2
+	# Expand @filename if present
+	if [ ${1:0:1} == "@" ]; then
+		msg=$(cat ${1:1})
+		id=$(basename $1)
+	else
+		msg=$2
+		id=$1
+	fi
 
+	# Send email to admins
 	/usr/sbin/sendmail -t <<-end
 		From: "Bismark Device Manager" <do-not-reply@gtnoise.net>
 		To: "Walter" <walter.dedonato@unina.it>, "Brian" <bpoole@cc.gatech.edu>, "Srikanth" <srikanth@gatech.edu>
-		Subject: Bismark Notification System ($1)
+		Subject: Bismark Notification System ($id)
 		Date: $(date -R)
 		Content-type: text/plain