Fix color loading

[~andy/rhawk] / rhawk

diff --git a/rhawk b/rhawk
index b31fac2db501d814eaf20a63bfd0d67387c1356a..2b8370613db042c7d3377cc1b861156e9828ac84 100755 (executable)
--- a/rhawk
+++ b/rhawk
@@ -9,7 +9,7 @@
 BEGIN {
        json_load("var/login.json",     login);
        json_load("var/nounicode.json", nounicode);
-       json_load("var/nocolor.json",   nocolors);
+       json_load("var/nocolor.json",   nocolor);
 
        OWNER = login["owner"];
 
@@ -22,7 +22,7 @@ BEGIN {
        delete login
 
        if (FIRST) {
-               join("#rhnoise")
+               join("#rhtest")
                join("#rhspades")
                join("#sfvlug")
        }
@@ -145,6 +145,11 @@ BEGIN { pollchan = "#sfvlug" }
 }
 
 # Versin/Uptime
+function head(cmd, var) {
+       cmd | getline var
+       close(cmd)
+       return var
+}
 function uptime(time,  fmt) {
        fmt = "%d:%02d:%02d:%02d"
        fmt = "%d days %02d:%02d:%02d"
@@ -155,13 +160,13 @@ function uptime(time,  fmt) {
                time / (1       ) % 60)
 }
 BEGIN {
-       _cmd = "git describe --always --dirty";
-       _cmd | getline up_version;
-       close(_cmd);
-       up_reload = systime();
+       up_version = head("git describe --always --dirty")
+       up_author  = head("git log -n1 --format=format:%an")
+       up_message = head("git log -n1 --format=format:%s")
+       up_reload  = systime();
 }
-/^\.version/ {
-       say("version: " up_version)
+/^\.(version|rev)/ {
+       say("version: " up_version " - " up_author " - " up_message)
 }
 /^\.uptime/ {
        _now = systime();
@@ -197,6 +202,16 @@ TO == NICK && /^\.?fortune/     {
        next
 }
 
+/\<[Bb][Oo][Ff][Hh]\>/ {
+       _cmd = "fortune bofh-excuses"
+       _cmd | getline _fortune
+       _cmd | getline _fortune
+       _cmd | getline _fortune
+       close(_cmd)
+       say(_fortune)
+       next
+}
+
 # Morse code
 BEGIN {
        morse["/"      ] = " "
@@ -344,6 +359,15 @@ FROM == "rhnoise" && $2 == "slaps" && $3 == NICK {
        say("THE LARCH");
 }
 
+/(for what|that for)\?$/ {
+       say("For great justice!");
+}
+
+/\<nazi/ {
+       say("And now it's...");
+       say("Springtime for Hitler and Germany!");
+}
+
 # God damn commands
 FROM == "rhnoise" && load_mod {
        say(".load " load_mod)