From a6291c99e0d44a3117dc0f019fa1f43871355809 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Thu, 19 Aug 2021 09:33:43 +0200
Subject: Moving irc-notification in container program into hook.

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

diff --git a/bin/container b/bin/container
index 68e3965..338cce7 100755
--- a/bin/container
+++ b/bin/container
@@ -62,46 +62,20 @@ do
 		fi
 	done
 
-	# Notification
-	if echo "${OPTIONS}" | grep -qs "\--no-notification"
-	then
-		OPTIONS="$(echo "${OPTIONS}" | sed -e 's|--no-notification||')"
-	else
-		case "${COMMAND}" in
-			build|b|get|g|move|mv|remove|rm|restart|rt|start|s|stop|t|update|u)
-				if [ -z "${CONTAINER_USER}" ]
-				then
-					CONTAINER_USER="${SUDO_USER:-${USER}}"
-				fi
-
-				DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
-				HOST="$(hostname -f 2> /dev/null || hostname)"
-
-				# logfile
-				echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
-
-				# irc
-				if  [ -e /usr/bin/irk ]
-				then
-					for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
-					do
-						if [ -e "${FILE}" ]
-						then
-							. "${FILE}"
-						fi
-					done
-
-					if [ -n "${IRK_TARGETS}" ]
-					then
-						for TARGET in ${IRK_TARGETS}
-						do
-							irk "${TARGET}" "\x0300${CONTAINER_USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
-						done
-					fi
-				fi
-				;;
-		esac
-	fi
+	# logfile
+	case "${COMMAND}" in
+		build|b|get|g|move|mv|remove|rm|restart|rt|start|s|stop|t|update|u)
+			if [ -z "${CONTAINER_USER}" ]
+			then
+				CONTAINER_USER="${SUDO_USER:-${USER}}"
+			fi
+
+			DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
+			HOST="$(hostname -f 2> /dev/null || hostname)"
+
+			echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log"
+			;;
+	esac
 
 	# Run
 	"/usr/libexec/${PROGRAM}/${COMMAND}" "${OPTIONS}"
diff --git a/share/hooks/pre-container.irc-notification.sh b/share/hooks/pre-container.irc-notification.sh
new file mode 100755
index 0000000..8a68bc5
--- /dev/null
+++ b/share/hooks/pre-container.irc-notification.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+set -e
+
+PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
+PROGRAM="container"
+
+# Notification on some command only
+case "${COMMAND}" in
+	build|b|get|g|move|mv|remove|rm|restart|rt|start|s|stop|t|update|u)
+		;;
+
+	*)
+		exit 0
+		;;
+esac
+
+# Depends
+if [ ! -e /usr/bin/irk ]
+then
+	# quiet exit
+	exit 0
+fi
+
+# Configuration
+for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+do
+	if [ -e "${FILE}" ]
+	then
+		. "${FILE}"
+	fi
+done
+
+if [ -z "${IRK_TARGETS}" ]
+then
+	# quiet exit
+	exit 0
+fi
+
+if [ -z "${CONTAINER_USER}" ]
+then
+	CONTAINER_USER="${SUDO_USER:-${USER}}"
+fi
+
+DATE="$(date +%Y-%m-%d\ %H:%M:%S)"
+HOST="$(hostname -f 2> /dev/null || hostname)"
+
+# Run
+for TARGET in ${IRK_TARGETS}
+do
+	irk "${TARGET}" "\x0300${CONTAINER_USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}"
+done
-- 
cgit v1.2.3