From 1fbbe9bdd51245f8a95056c91d1724a002cde391 Mon Sep 17 00:00:00 2001
From: Rhys Smith <rhys.smith@jisc.ac.uk>
Date: Sun, 11 Sep 2016 09:40:41 +0100
Subject: [PATCH] Add support for plain slack messages with no colour

---
 build.xml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 6dbe9c64..f883ef0a 100644
--- a/build.xml
+++ b/build.xml
@@ -1484,14 +1484,25 @@
 
     <macrodef name="SLACK.send">
         <attribute name="conf"/>
-        <attribute name="colour"/>
+        <attribute name="colour" default="none"/>
         <attribute name="channel"/>
         <attribute name="message"/>
         <sequential>
-            <exec executable="bash" failonerror="true">
-                <arg value="-c"/>
-                <arg value="echo -e '@{message}' | ${tools.slacktee}/bin/slacktee.sh -p --config @{conf} -a @{colour} -c @{channel}"/>
-            </exec>
+            <if>
+                <equals arg1="@{colour}" arg2="none"/>
+                <then>
+                    <exec executable="bash" failonerror="true">
+                        <arg value="-c"/>
+                        <arg value="echo -e '@{message}' | ${tools.slacktee}/bin/slacktee.sh -p --config @{conf} -c @{channel}"/>
+                    </exec>
+                </then>
+                <else>
+                    <exec executable="bash" failonerror="true">
+                        <arg value="-c"/>
+                        <arg value="echo -e '@{message}' | ${tools.slacktee}/bin/slacktee.sh -p --config @{conf} -a @{colour} -c @{channel}"/>
+                    </exec>
+                </else>
+            </if>
         </sequential>
     </macrodef>