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

3 files changed, 17 insertions, 4 deletions

diff --git a/punani/bin/punani b/punani/bin/punani
index 3f11cec8..97c7ac85 100755
--- a/punani/bin/punani
+++ b/punani/bin/punani
@@ -25,8 +25,8 @@ elif for PACKER_CMD in bauerbill packer yaourt pacman
 
 elif for PACKER_CMD in aptitude apt-get
     do type $PACKER_CMD 2>/dev/null 1>&2 && break; done; then
-  INSTALL_PARAM='--yes install'
-  REMOVE_PARAM='--yes remove'
+  INSTALL_PARAM='-y install'
+  REMOVE_PARAM='-y remove'
 
 else
   echo "Error 2: no known package manager found; no punani for you!" >&2
diff --git a/punani/db/punani b/punani/db/punani
index df471f3a..ad477dab 100644
--- a/punani/db/punani
+++ b/punani/db/punani
@@ -7,12 +7,24 @@
   "super-packer" : {
     "yaourt" : "pacman"
   },
+  "nano" : {
+    "apt-get" : "nano",
+    "pacman" : "nano"
+    },
   "vim" : {
     "apt-get" : "vim",
     "pacman" : "vim",
     "brew" : "vim",
     "yum" : "vim"
   },
+  "zsh" : {
+    "pacman" : "zsh",
+    "apt-get" : "zsh"
+  },
+  "git" : {
+   "pacman" : "git",
+   "apt-get" : "git-core"
+  },
   "unison" : {
     "apt-get" : "unison",
     "pacman" : "unison"
diff --git a/punani/index.py b/punani/index.py
index ac19b2fb..ff483d37 100755
--- a/punani/index.py
+++ b/punani/index.py
@@ -3,6 +3,7 @@
 import web
 import json
 import os
+import sys
 from bot import *
 urls = ( 
   '/', 'Index',
@@ -12,7 +13,7 @@ urls = (
 )
 
 
-PDB_FILE="db/punani"
+PDB_FILE=os.path.dirname(os.path.abspath(sys.argv[0])) + "/db/punani"
 PORT="9111"
 CHANNEL="#retiolum"
 f = open(PDB_FILE)
@@ -70,7 +71,7 @@ class ArchFinder:
 if __name__ == "__main__":
   import sys 
   # Set IRC connection parameters.
-  irc_servers = [('supernode', 6667)]
+  irc_servers = [('supernode.retiolum', 6667)]
   irc_channels = [('#retiolum','')]
 
   # Prepare and start IRC bot.