Merge branch 'master' into fixes

1 files changed, 18 insertions, 0 deletions

diff --git a/bin/ii-connect b/bin/ii-connect
index ca8ea99..5fc5f37 100755
--- a/bin/ii-connect
+++ b/bin/ii-connect
@@ -79,8 +79,10 @@ if [ "$1" = 'watch' ]; then
         channel="${channel##*/}"
         if [ -z "${channel%%#*}" ]; then
           prefix='buildmaster: '
+          sloppy_salutation='buildmaster'
         else
           prefix=''
+          sloppy_salutation=''
         fi
         regex='^\(\S\+ \)\?\S\+ <\S\+> '"${prefix}"'why[- ]don'"'"'\?t[- ]you \(build\|stabilize\|unstage\|keep\|stubbornly_keep\) '
         if grep -q "${regex}" "${out_file}"; then
@@ -130,6 +132,22 @@ if [ "$1" = 'watch' ]; then
             done
           sed -i "/${regex}/d" "${out_file}"
         fi
+        regex='^\(\S\+ \)\?\S\+ <\S\+> .*[Ww]hat'"'"'\?s *[Uu]p'
+        if grep "${regex}" "${out_file}" | \
+          grep -q "${sloppy_salutation}"; then
+          done_something=true
+          sed -i "/${regex}/d" "${out_file}"
+          printf 'up? I'"'"'m up for %s, %s\n' "$(uptime -p | sed 's/^up //')" "$(uptime | sed 's/.*,  //')"  | \
+            sponge "${out_file%/out}/in"
+        fi
+        regex='^\(\S\+ \)\?\S\+ <\S\+> \(.* \)\?[Tt]h\(anks\|x\)\([ ,.!]\|$\)'
+        if grep "${regex}" "${out_file}" | \
+          grep -q "${sloppy_salutation}"; then
+          done_something=true
+          sed -i "/${regex}/d" "${out_file}"
+          printf 'np\n' | \
+            sponge "${out_file%/out}/in"
+        fi
       done
     sleep 1
   done