From 9398190a5d04027efff0955b3d28e69dd22c3cfb Mon Sep 17 00:00:00 2001
From: neersighted <neersighted@neersighted.com>
Date: Thu, 29 Mar 2012 17:16:31 -0700
Subject: [PATCH] merge mem/sys

---
 plugins/data/itemids.txt      |  0
 plugins/data/recipes.txt      |  0
 plugins/mcitems.py            |  0
 plugins/misc.py               |  9 ---------
 plugins/{mem.py => system.py} | 10 +++++++++-
 plugins/violence.py           |  0
 6 files changed, 9 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 plugins/data/itemids.txt
 mode change 100644 => 100755 plugins/data/recipes.txt
 mode change 100644 => 100755 plugins/mcitems.py
 rename plugins/{mem.py => system.py} (71%)
 mode change 100644 => 100755 plugins/violence.py

diff --git a/plugins/data/itemids.txt b/plugins/data/itemids.txt
old mode 100644
new mode 100755
diff --git a/plugins/data/recipes.txt b/plugins/data/recipes.txt
old mode 100644
new mode 100755
diff --git a/plugins/mcitems.py b/plugins/mcitems.py
old mode 100644
new mode 100755
diff --git a/plugins/misc.py b/plugins/misc.py
index 3953288..1a25988 100755
--- a/plugins/misc.py
+++ b/plugins/misc.py
@@ -61,12 +61,3 @@ def onjoin(paraml, conn=None, bot=None):
         while True:
             time.sleep(delay)
             conn.cmd('PING', [conn.nick])
-            
-# system info command
-@hook.command(autohelp=False)
-def system(inp):
-    ".system -- Retrieves information about the host system."
-    python_version = platform.python_version()
-    os = platform.platform(aliased=True)
-    cpu = platform.machine()
-    return "Platform: %s, Python Version: %s, CPU: %s" % (os, python_version, cpu)
diff --git a/plugins/mem.py b/plugins/system.py
similarity index 71%
rename from plugins/mem.py
rename to plugins/system.py
index 844238f..f8bb9ee 100755
--- a/plugins/mem.py
+++ b/plugins/system.py
@@ -1,6 +1,6 @@
 import os
 import re
-
+import platform
 from util import hook
 
 
@@ -26,3 +26,11 @@ def mem(inp):
         return 'Memory usage: \x02%d kB\x02' % total
 
     return mem.__doc__
+
+@hook.command(autohelp=False)
+def sys(inp):
+    ".sys -- Retrieves information about the host system."
+    python_version = platform.python_version()
+    os = platform.platform(aliased=True)
+    cpu = platform.machine()
+    return "Platform: %s, Python Version: %s, CPU: %s" % (os, python_version, cpu)
diff --git a/plugins/violence.py b/plugins/violence.py
old mode 100644
new mode 100755