Merge all the shits

6 files changed, 6 insertions, 3 deletions

diff --git a/Reaktor/IRC/reaktor.py b/Reaktor/IRC/reaktor.py
index ec306e7c..f9f25e57 100755
--- a/Reaktor/IRC/reaktor.py
+++ b/Reaktor/IRC/reaktor.py
@@ -86,8 +86,9 @@ class Reaktor(asybot):
 
     start = time()
     try:
+      print(myargv)
       p = popen(myargv, bufsize=1, stdout=PIPE, stderr=PIPE, env=env, cwd=cwd)
-    except (OSError, Exception) as error:
+    except Exception as error:
       self.ME(target, 'brain damaged')
       log.error('OSError@%s: %s' % (myargv, error))
       return
diff --git a/Reaktor/commands/caps b/Reaktor/commands/caps
index b5d6642d..ac8cc66d 100755
--- a/Reaktor/commands/caps
+++ b/Reaktor/commands/caps
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 import imp
 import os
 
diff --git a/Reaktor/config.py b/Reaktor/config.py
index ea00693f..b1158271 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -5,7 +5,8 @@ debug = False
 
 name = 'crabmanner'
 
-workdir = expanduser('~') + '/state'
+#workdir = expanduser('~') + '/state'
+workdir = '/home/reaktor/state'
 
 irc_alarm_timeout = 300
 irc_hammer_interval = 10
diff --git a/Reaktor/repos/view-website b/Reaktor/repos/view-website
-Subproject 5b9a22cf872a9855b7cb5eddd7bf962dfbff50d
+Subproject a3892837aabd5d95e997c0fd2526096f685669f
diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb
-Subproject 0918a0d9b75df77f9c3e9eb360b6b22824582a2
+Subproject 362145cf80ccd82d4c32e15b37eeff745e0ba66
diff --git a/Reaktor/titlebot/commands/help b/Reaktor/titlebot/commands/help
index 475ea98e..f04e43b7 100755
--- a/Reaktor/titlebot/commands/help
+++ b/Reaktor/titlebot/commands/help
@@ -3,6 +3,7 @@ cat <<EOF
 BGT Title Poll Bot:
   .new TITLE              - suggest a new title
   .list <(age|votes)>     - list all suggestions
+  .highest <NUM>          - lists the NUM highest voted suggestions
   .up NUM (NUM ...)       - upvote one or more suggestions from .list
   .undo NUM (NUM ...)     - undo an upvote
   .clear                  - clear the poll (auth required)