From 6fd4b82674ee7209497813b7ae3ab01032b8beb6 Mon Sep 17 00:00:00 2001
From: Someone <someone@somenet.org>
Date: Mon, 11 Nov 2013 03:18:02 +0100
Subject: [PATCH] more robust usercount detection

---
 irccomp_    | 2 +-
 ircdlusers_ | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/irccomp_ b/irccomp_
index 3917dfc..86ccbe4 100755
--- a/irccomp_
+++ b/irccomp_
@@ -56,7 +56,7 @@ fi
 
 for net in $NETIDLIST; do
    grep -i "There are" /tmp/irc_${net}/lusers.txt 2>/dev/null | sed -E 's~^There are .*? on ([0-9]+) servers.*$~srv_'${net}'.value \1~'
-   grep -i "Current Global Users" /tmp/irc_${net}/lusers.txt 2>/dev/null | sed -E 's~^Current Global Users: ([0-9]+) .*$~clt_'${net}'.value \1~'
+   grep -i "Current Global Users" /tmp/irc_${net}/lusers.txt 2>/dev/null | sed -Ee 's/^.*[Cc]urrent [Gg]lobal [Uu]sers:? ([0-9]+).*[Mm]ax.*$/clt_'${net}'.value \1/'
    grep -i "channels" /tmp/irc_${net}/lusers.txt 2>/dev/null | sed -E 's~^([0-9]+).*$~ch_'${net}'.value \1~'
 done
 
diff --git a/ircdlusers_ b/ircdlusers_
index fc5d3d4..9054e87 100755
--- a/ircdlusers_
+++ b/ircdlusers_
@@ -40,6 +40,6 @@ if [ "$1" = "config" ]; then
 fi
 
 cat "/tmp/irc_${IRCNET}/lusers.txt" | grep 'channels formed' | sed -e 's/\(.*\) channels formed/channels.value \1/'
-cat "/tmp/irc_${IRCNET}/lusers.txt" | grep 'Current Global Users' | sed -e 's/Current Global Users: \(.*\)  Max.*$/clients.value \1/'
+cat "/tmp/irc_${IRCNET}/lusers.txt" | grep -i 'Current Global Users' | sed -Ee 's/^.*[Cc]urrent [Gg]lobal [Uu]sers:? ([0-9]+).*[Mm]ax.*$/clients.value \1/'
 cat "/tmp/irc_${IRCNET}/lusers.txt" | grep 'There are ' | sed -e 's/^.*on \(.*\) servers/servers.value \1/'
 exit 0
-- 
2.43.0