From a54a0581d42a45169650854f746188bf6fd270b6 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 12 Jul 2019 12:34:11 +0200
Subject: bin/ping-from-slave,bin/return-assignment: use the improved irc_say()

---
 bin/ping-from-slave   |  6 +++---
 bin/return-assignment | 23 ++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'bin')

diff --git a/bin/ping-from-slave b/bin/ping-from-slave
index 88b25ef..b228972 100755
--- a/bin/ping-from-slave
+++ b/bin/ping-from-slave
@@ -44,9 +44,9 @@ if [ "${status% *}" != '1' ]; then
           "$(printf '%s' "${slave}" | base64 -w0)"
       } | \
         mysql_run_query
-      printf '/j %s Your buildslave "%s" builds some outdated package.\n' \
-        "${operator}" "${slave}" | \
-        sponge "${irc_dir}/in"
+      printf 'Your buildslave "%s" builds some outdated package.\n' \
+        "${slave}" | \
+        irc_say "${operator}"
     fi
   fi
   exit 2
diff --git a/bin/return-assignment b/bin/return-assignment
index 75a358d..f97ad7b 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -633,9 +633,9 @@ missing_files=$(
 
 if [ -n "${missing_files}" ]; then
   >&2 echo 'The following packages lack a signature, namcap log, package file or list of needed/provided libraries:'
-  printf '/j %s Your buildslave "%s" uploaded some incomplete package(s):\n' \
-    "${operator}" "${slave}" | \
-    sponge "${irc_dir}/in"
+  printf 'Your buildslave "%s" uploaded some incomplete package(s):\n' \
+    "${slave}" | \
+    irc_say "${operator}"
   printf '%s\n' "${missing_files}" | \
     irc_say "${operator}" 'copy' >&2
   exit 3
@@ -657,9 +657,9 @@ if [ -z "$(
     uniq -d
 )" ]; then
   >&2 echo 'Signature(s) is/are not fully trusted:'
-  printf '/j %s Your buildslave "%s" uploaded a package with a not fully-trusted signature:\n' \
-    "${operator}" "${slave}" | \
-    sponge "${irc_dir}/in"
+  printf 'Your buildslave "%s" uploaded a package with a not fully-trusted signature:\n' \
+    "${slave}" | \
+    irc_say "${operator}"
   printf '%s\n' "${signatures}" | \
     irc_say "${operator}" 'copy' >&2
   exit 3
@@ -678,9 +678,9 @@ errors=$(
 )
 if [ -n "${errors}" ]; then
   >&2 echo 'Packager error(s):'
-  printf '/j %s Your buildslave "%s" uploaded package(s) with invalid packager:\n' \
-    "${operator}" "${slave}" | \
-    sponge "${irc_dir}/in"
+  printf 'Your buildslave "%s" uploaded package(s) with invalid packager:\n' \
+    "${slave}" | \
+    irc_say "${operator}"
   printf '%s\n' "${errors}" | \
     irc_say "${operator}" 'copy' >&2
   exit 3
@@ -733,10 +733,7 @@ if [ -n "${package_errors}" ]; then
       "${slave}"
     printf '%s\n' "${package_errors}"
   } | \
-    sed '
-      s@^@/j '"${operator}"' @
-    ' | \
-    sponge "${irc_dir}/in"
+    irc_say "${operator}"
   exit 4
 fi
 
-- 
cgit v1.2.3-54-g00ecf