Reorganize the code and fix the setup.py

skhurram · Jan 22, 2012 · 5ced84a · 5ced84a
1 parent 60de5c6
commit 5ced84a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include README.md
diff --git a/kip/__init__.py b/kip/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.1.1"
diff --git a/kip/__init__.pyc b/kip/__init__.pyc
diff --git a/kip.py → kip/cli.py b/kip.py → kip/cli.py
@@ -31,12 +31,14 @@
 import subprocess
 import glob
 
-__version__ = "0.1.1"
 NAME = sys.argv[0]
 
 config=ConfigParser.ConfigParser()
-config.read(['kip.conf', os.path.expanduser('~/.kip/kip.conf')])
-
+config.read(
+        [
+            os.path.join(os.path.dirname(__file__), "kip.conf"),
+            os.path.expanduser('~/.kip/kip.conf')
+        ])
 
 HOME_PWD = os.path.expanduser(config.get('passwords', 'home'))
 LEN_PWD = int(config.get('passwords', 'len'))

diff --git a/kip.conf → kip/kip.conf b/kip.conf → kip/kip.conf
diff --git a/setup.py b/setup.py
@@ -18,10 +18,10 @@ def read(fname):
     description="kip Keeps Passwords",
     long_description=read('README.md'),
     packages=find_packages(),
-    package_data={},
+    package_data={'kip': ['kip.conf']},
     entry_points={
         'console_scripts':[
-            'kip=kip:main'
+            'kip=kip.cli:main'
             ]
     },
     url="https://github.com/grahamking/kip",