From d5d9073f5317290b7aa679d930c2718cd1cdec20 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Fri, 14 Mar 2014 04:33:13 +0100
Subject: irc-announce: fix conflict resolution fail

---
 git/gitolite-hooks/irc-announce | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'git')

diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce
index ca8b0059..aa9f91f3 100755
--- a/git/gitolite-hooks/irc-announce
+++ b/git/gitolite-hooks/irc-announce
@@ -1,13 +1,18 @@
 #! /bin/sh
 set -euf
 
+config_file="$HOME/.local/krebs/irc-announce"
+if test -f "$config_file"; then
+  . "$config_file"
+fi
+
 # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update
 #     any relevant gitolite LOCAL_CODE!
 # CAVEAT we hope that IRC_NICK is unique
-IRC_NICK="gl$GL_TID"
-IRC_CHANNEL='#retiolum'
-IRC_SERVER='ire.retiolum'
-IRC_PORT=6667
+IRC_NICK="${IRC_NICK-gl$GL_TID}"
+IRC_CHANNEL="${IRC_CHANNEL-#retiolum}"
+IRC_SERVER="${IRC_SERVER-ire.retiolum}"
+IRC_PORT="${IRC_PORT-6667}"
 
 # for privmsg_cat below
 export IRC_CHANNEL
@@ -86,6 +91,11 @@ privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
     | privmsg_cat \
     | cat2
 
+  echo2 "PART $IRC_CHANNEL"
+
+  # TESTME does this sleep help to send all messages?
+  sleep 5
+
   echo2 'QUIT :Gone to have lunch'
 
   printf 
-- 
cgit v1.2.3