From da665e1f9e7c9fb45e2cbb94e783164b1953150f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Tue, 20 Dec 2016 18:39:30 +0100
Subject: Moving irc notification from container program to hook.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 bin/container                | 28 ----------------------------
 share/hooks/notification-irc | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100755 share/hooks/notification-irc

diff --git a/bin/container b/bin/container
index 0a6b7e3..37c87a3 100755
--- a/bin/container
+++ b/bin/container
@@ -57,34 +57,6 @@ do
 	fi
 done
 
-# Notification
-if echo "${OPTIONS}" | grep -qs "\--no-notification"
-then
-	OPTIONS="$(echo "${OPTIONS}" | sed -e 's|--no-notification||')"
-else
-	case "${COMMAND}" in
-		create|remove|rm|restart|start|stop)
-			USER="${SUDO_USER:-${USER}}"
-			DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
-			HOST="$(hostname -f)"
-
-			# irc
-			if  [ -e /usr/bin/irk ] && [ -e "/etc/default/${SOFTWARE}" ]
-			then
-				. /etc/default/${SOFTWARE}
-
-				if [ -n "${IRK_TARGETS}" ]
-				then
-					for TARGET in ${IRK_TARGETS}
-					do
-						irk ${TARGET} "\x0300${USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
-					done
-				fi
-			fi
-			;;
-	esac
-fi
-
 # Run
 exec "/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}"
 
diff --git a/share/hooks/notification-irc b/share/hooks/notification-irc
new file mode 100755
index 0000000..1b4b620
--- /dev/null
+++ b/share/hooks/notification-irc
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+CONFFILE="${0}.conf"
+
+if echo "${OPTIONS}" | grep -qs "\--no-notification"
+then
+	exit 0
+fi
+
+if  [ ! -e /usr/bin/irk ] || [ ! -r "${CONFFILE}" ]
+then
+	exit 0
+fi
+
+. "${CONFFILE}"
+
+if [ -z "${IRC_CHANNELS}" ]
+then
+	exit 0
+fi
+
+case "${COMMAND}" in
+	create|remove|rm|restart|start|stop)
+		DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
+		HOST="$(hostname -f)"
+		USER="${SUDO_USER:-${USER}}"
+
+		for CHANNEL in ${IRC_CHANNELS}
+		do
+			irk ${CHANNEL} "\x0300${USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
+		done
+		;;
+esac
-- 
cgit v1.2.3