19 files changed, 9 insertions, 19 deletions
diff --git a/cnucnu b/cnucnu
deleted file mode 100755
index 5e1df50..0000000
--- a/cnucnu
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-. setup-env.sh
-bin/cnucnu "$@"
diff --git a/bin/cnucnu b/cnucnu.py
index 0ad8b2d..0ad8b2d 100755
--- a/bin/cnucnu
+++ b/cnucnu.py
diff --git a/lib/cnucnu/__init__.py b/cnucnu/__init__.py
index f43b892..f43b892 100644
--- a/lib/cnucnu/__init__.py
+++ b/cnucnu/__init__.py
diff --git a/lib/cnucnu/bugzilla_reporter.py b/cnucnu/bugzilla_reporter.py
index c321622..c321622 100644
--- a/lib/cnucnu/bugzilla_reporter.py
+++ b/cnucnu/bugzilla_reporter.py
diff --git a/lib/cnucnu/checkshell.py b/cnucnu/checkshell.py
index 5d92dc1..5d92dc1 100644
--- a/lib/cnucnu/checkshell.py
+++ b/cnucnu/checkshell.py
diff --git a/lib/cnucnu/config.py b/cnucnu/config.py
index d0c4bbb..13910d0 100755
--- a/lib/cnucnu/config.py
+++ b/cnucnu/config.py
@@ -148,7 +148,7 @@ if __name__ == '__main__':
     print "Default config"
     pprint(cf.config)
 
-    cf.update_yaml_file('../../cnucnu.yaml')
+    cf.update_yaml_file('../cnucnu.yaml')
     
     print "Global config"
     pprint(cf.config)
diff --git a/lib/cnucnu/cvs.py b/cnucnu/cvs.py
index 29c0a0a..29c0a0a 100755
--- a/lib/cnucnu/cvs.py
+++ b/cnucnu/cvs.py
diff --git a/lib/cnucnu/errors.py b/cnucnu/errors.py
index 01f7c04..01f7c04 100644
--- a/lib/cnucnu/errors.py
+++ b/cnucnu/errors.py
diff --git a/lib/cnucnu/helper.py b/cnucnu/helper.py
index f2d61de..f2d61de 100644
--- a/lib/cnucnu/helper.py
+++ b/cnucnu/helper.py
diff --git a/lib/cnucnu/mail.py b/cnucnu/mail.py
index 7928973..7928973 100755
--- a/lib/cnucnu/mail.py
+++ b/cnucnu/mail.py
diff --git a/lib/cnucnu/package_list.py b/cnucnu/package_list.py
index fa2244d..fa2244d 100644
--- a/lib/cnucnu/package_list.py
+++ b/cnucnu/package_list.py
diff --git a/cnucnu/tests/__init__.py b/cnucnu/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cnucnu/tests/__init__.py
diff --git a/lib/cnucnu/tests/config_test.py b/cnucnu/tests/config_test.py
index 5b1e97a..afa576b 100755
--- a/lib/cnucnu/tests/config_test.py
+++ b/cnucnu/tests/config_test.py
@@ -21,9 +21,6 @@ import unittest
 
 import sys
 sys.path.insert(0, '../..')
-sys.path.insert(0, '..')
-sys.path.insert(0, './lib')
-
 
 from cnucnu.config import Config
 
diff --git a/lib/cnucnu/tests/mail_test.py b/cnucnu/tests/mail_test.py
index f623bd0..0be8d23 100755
--- a/lib/cnucnu/tests/mail_test.py
+++ b/cnucnu/tests/mail_test.py
@@ -21,8 +21,6 @@ import unittest
 
 import sys
 sys.path.insert(0, '../..')
-sys.path.insert(0, '..')
-sys.path.insert(0, './lib')
 
 
 from cnucnu.mail import Message
diff --git a/lib/cnucnu/tests/package_list_test.py b/cnucnu/tests/package_list_test.py
index 5ed04fc..20388e3 100755
--- a/lib/cnucnu/tests/package_list_test.py
+++ b/cnucnu/tests/package_list_test.py
@@ -21,9 +21,6 @@ import unittest
 
 import sys
 sys.path.insert(0, '../..')
-sys.path.insert(0, '..')
-sys.path.insert(0, './lib')
-
 
 from cnucnu.package_list import Package
 from cnucnu.package_list import Repository
diff --git a/lib/cnucnu/wiki.py b/cnucnu/wiki.py
index 7b138d4..7b138d4 100755
--- a/lib/cnucnu/wiki.py
+++ b/cnucnu/wiki.py
diff --git a/runtests.sh b/runtests.sh
index 3b12705..dc14b64 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -17,6 +17,8 @@
 #    along with cnucnu.  If not, see <http://www.gnu.org/licenses/>.
 #}}}
 
-lib/cnucnu/tests/package_list_test.py
-lib/cnucnu/tests/mail_test.py
-lib/cnucnu/tests/config_test.py
+. setup-env.sh
+
+cnucnu/tests/package_list_test.py
+cnucnu/tests/mail_test.py
+cnucnu/tests/config_test.py
diff --git a/setup-env.sh b/setup-env.sh
index f3360b6..bbe291a 100644
--- a/setup-env.sh
+++ b/setup-env.sh
@@ -5,6 +5,6 @@ else
     CNUCNU_BASEDIR="."
 fi
 
-export PYTHONPATH=${CNUCNU_BASEDIR:-${PWD}}/lib
+export PYTHONPATH=${CNUCNU_BASEDIR:-${PWD}}
 
 #echo "new PYTHONPATH: ${PYTHONPATH}"
diff --git a/setup.py b/setup.py
index 5a0a15b..e7a8e51 100755
--- a/setup.py
+++ b/setup.py
@@ -25,8 +25,8 @@ setup(name='cnucnu',
       author='Till Maas',
       author_email='opensource@till.name',
       url='http://fedorapeople.org/gitweb?p=till/public_git/cnucnu.git;a=summary',
-      scripts=['bin/cnucnu'],
-      package_dir = {'': 'lib'},
+      scripts=['cnucnu.py'],
+      package_dir = {'': '.'},
       packages = ['cnucnu'],
      )