Reaktor: cleanup, bump version

11 files changed, 13 insertions, 13 deletions

diff --git a/Reaktor/public_commands/caps b/Reaktor/public_commands/caps
deleted file mode 120000
index 43c0a342..00000000
--- a/Reaktor/public_commands/caps
+++ /dev/null
@@ -1 +0,0 @@
-../commands/caps
\ No newline at end of file
diff --git a/Reaktor/public_commands/hello b/Reaktor/public_commands/hello
deleted file mode 120000
index 4509249b..00000000
--- a/Reaktor/public_commands/hello
+++ /dev/null
@@ -1 +0,0 @@
-../commands/hello
\ No newline at end of file
diff --git a/Reaktor/public_commands/reload b/Reaktor/public_commands/reload
deleted file mode 120000
index 9a337850..00000000
--- a/Reaktor/public_commands/reload
+++ /dev/null
@@ -1 +0,0 @@
-../commands/reload
\ No newline at end of file
diff --git a/Reaktor/public_commands/retard b/Reaktor/public_commands/retard
deleted file mode 120000
index 29ae4b01..00000000
--- a/Reaktor/public_commands/retard
+++ /dev/null
@@ -1 +0,0 @@
-../commands/retard
\ No newline at end of file
diff --git a/Reaktor/public_commands/rev b/Reaktor/public_commands/rev
deleted file mode 120000
index f5433412..00000000
--- a/Reaktor/public_commands/rev
+++ /dev/null
@@ -1 +0,0 @@
-../commands/rev
\ No newline at end of file
diff --git a/Reaktor/public_commands/uptime b/Reaktor/public_commands/uptime
deleted file mode 120000
index ffe5fbd7..00000000
--- a/Reaktor/public_commands/uptime
+++ /dev/null
@@ -1 +0,0 @@
-../commands/uptime
\ No newline at end of file
diff --git a/Reaktor/reaktor/commands/caps b/Reaktor/reaktor/commands/caps
index ac8cc66d..b5d6642d 100755
--- a/Reaktor/reaktor/commands/caps
+++ b/Reaktor/reaktor/commands/caps
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
 import imp
 import os
 
diff --git a/Reaktor/reaktor/commands/licht_resolver b/Reaktor/reaktor/commands/licht_resolver
index 5bdb6510..90d06c8c 100755
--- a/Reaktor/reaktor/commands/licht_resolver
+++ b/Reaktor/reaktor/commands/licht_resolver
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
 map = {
diff --git a/Reaktor/reaktor/config.py b/Reaktor/reaktor/config.py
index 85824321..56ef71e8 100644
--- a/Reaktor/reaktor/config.py
+++ b/Reaktor/reaktor/config.py
@@ -102,7 +102,8 @@ public_commands = [
   default_command('tell', cmd='tell-on_privmsg', env={
     'state_file': workdir + '/tell.txt'
   }),
-  default_command('nag', env=nag_env),
+  # TODO this is disabled until someone fixes it
+  #default_command('nag', env=nag_env),
   simple_command('identify', env={
     'config_filename': config_filename
   }),
diff --git a/Reaktor/setup.py b/Reaktor/setup.py
index 959d4c7c..7b781713 100644
--- a/Reaktor/setup.py
+++ b/Reaktor/setup.py
@@ -3,17 +3,21 @@ from setuptools import setup
 
 setup(
     name='Reaktor',
-    version='0.2.3',
+    version='0.3.2',
 
     description='an IRC bot based on asyn* libs',
     long_description=open("README.md").read(),
     license='WTFPL',
-    url='http://localhost/',
-    download_url='http://localhost/',
+    url='http://krebsco.de/',
+    download_url='https://pypi.python.org/pypi/Reaktor/',
 
     author='krebs',
     author_email='spam@krebsco.de',
     install_requires = [ 'docopt' ],
+    extras_require = {
+        # 'all-plugins' : ['dnsrecon']  < not yet in pypi
+        },
+
     packages=['reaktor'],
     # optional non-python Deps:
     #   whatweb in path for 'whatweb'
@@ -21,6 +25,7 @@ setup(
     #   host  for 'taken'
     #   whois for 'whois'
     #   git for 'nag'
+    package_data = {'reaktor' : ['commands/*'] },
     entry_points={
         'console_scripts' : [
             'reaktor = reaktor.core:main'
@@ -31,6 +36,7 @@ setup(
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "Operating System :: POSIX :: Linux",
+        "Development Status :: 3 - Alpha",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
diff --git a/Reaktor/udp_commands/licht_resolver b/Reaktor/udp_commands/licht_resolver
deleted file mode 120000
index 0d8b0956..00000000
--- a/Reaktor/udp_commands/licht_resolver
+++ /dev/null
@@ -1 +0,0 @@
-../commands/licht_resolver
\ No newline at end of file