Merge branch 'master' of https://github.com/krebscode/painload

4 files changed, 21 insertions, 9 deletions

diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 6d19fd09..89967c3f 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -54,7 +54,7 @@ class asybot(asychat):
     # passed without a message.  Any incoming message will reset alarm.
     self.alarm_timeout = getconf('irc_alarm_timeout')
     self.hammer_interval = getconf('irc_hammer_interval')
-    self.kill_timeout = 360
+    self.kill_timeout = getconf('irc_kill_timeout')
     signal(SIGALRM, lambda signum, frame: self.alarm_handler())
     self.reset_alarm()
 
@@ -129,6 +129,7 @@ class asybot(asychat):
       y = match(command['pattern'], rest)
       if y:
         self.execute_command(command, y, PRIVMSG, ME)
+        break
 
   def execute_command(self, command, match, PRIVMSG, ME):
     from os.path import realpath, dirname, join
diff --git a/Reaktor/TODO b/Reaktor/TODO
index 6dbc2f8d..782a7248 100644
--- a/Reaktor/TODO
+++ b/Reaktor/TODO
@@ -1,6 +1,3 @@
-{ "pattern": "^(?:asybot|\\*):.*", "argv": [ "commands/say", "{{from.nickname}}: you are made of stupid" ], only_match: true }
-
-getconf: check syntax and semantics on load
 getconf: reload inotify
 
 apropros caps: commands need access to config
diff --git a/Reaktor/config.py b/Reaktor/config.py
index 8e7a8790..ec4abcb1 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -31,6 +31,6 @@ irc_commands = [
   { 'pattern': '^(?:' + name + '|\\*):.*',
     'argv': [ 'commands/say', '{TODO:fromname}: you are made of stupid!' ] },
   # "highlight"
-  { 'pattern': '\\b' + name + '\\b',
+  { 'pattern': '.*\\b' + name + '\\b.*',
     'argv': [ 'commands/say', 'I\'m famous' ] }
 ]
diff --git a/ship/src/remaster_arch_iso b/ship/src/remaster_arch_iso
index 66d5bc05..cb090bbd 100755
--- a/ship/src/remaster_arch_iso
+++ b/ship/src/remaster_arch_iso
@@ -87,8 +87,22 @@ EOF
 done
 
 info "creating Iso Image"
-genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \
-    -b isolinux/isolinux.bin -no-emul-boot \
-    -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \
-    -o "$outdir/$outfile" "$isodir" 
+#genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \
+#    -b isolinux/isolinux.bin -no-emul-boot \
+#    -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \
+#    -o "$outdir/$outfile" "$isodir" 
+rm -f "${outdir}/${outfile}"
+xorriso -as mkisofs \
+    -iso-level 3 \
+    -full-iso9660-filenames \
+    -volid "ARCH_201311" \
+    -appid "Shackspace Krebs Installer" \
+    -publisher "Shackspace/Krebs" \
+    -preparer "prepared by krebs" \
+    -eltorito-boot isolinux/isolinux.bin \
+    -eltorito-catalog isolinux/boot.cat \
+    -no-emul-boot -boot-load-size 4 -boot-info-table \
+    -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \
+    -output "${outdir}/${outfile}" \
+    "$isodir"