From ad668ad947883a7eb94869ace804d1711f0449b8 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 27 May 2021 11:50:44 +0200
Subject: bin/ii-answer: no phrik in #archlinux32-devops, so we should not `!rq
 $user`, there

---
 bin/ii-answer | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin/ii-answer')

diff --git a/bin/ii-answer b/bin/ii-answer
index 3077311..838b262 100755
--- a/bin/ii-answer
+++ b/bin/ii-answer
@@ -9,23 +9,23 @@
 
 # welcome devs (in #archlinux32 and #archlinux32-devops only)
 welcome_user_regex='^\S\+ -!- \(abaumann\|buildmaster\|deep42thought\|girls\|nit-picker\|tyzoid\)(.* has joined \S\+$'
-for channel in '#archlinux32' '#archlinux32-devops'; do
+for channel in '#archlinux32:Hi \0!\n!rq \0' '#archlinux32-devops:Hi \0!'; do
   new_users=$(
     sed -i '
       s/'"${welcome_user_regex}"'/\1/
       T
       w /dev/stdout
       d
-    ' "${irc_dir}/${channel}/out" | \
+    ' "${irc_dir}/${channel%%:*}/out" | \
       sort -u
   )
   if [ -n "${new_users}" ]; then
     printf '%s\n' "${new_users}" | \
       sed '
-        s/^.*$/Hi \0!\n!rq \0/
-        s/Hi buildmaster!\n//
+        s/^.*$/'"${channel#*:}"'/
+        s/Hi buildmaster!\(\n\|$\)//
       ' | \
-      irc_say "${channel}" 'copy'
+      irc_say "${channel%%:*}" 'copy'
   fi
 done
 
-- 
cgit v1.2.3