__init__ needs to be in the main package

[cascardo/ipsilon.git] / quickrun.py

diff --git a/quickrun.py b/quickrun.py
index 0546fcc..0722c7b 100755 (executable)
--- a/quickrun.py
+++ b/quickrun.py
@@ -41,7 +41,7 @@ CONF_TEMPLATE="templates/install/ipsilon.conf"
 
 ADMIN_TEMPLATE='''
 CREATE TABLE login_config (name TEXT,option TEXT,value TEXT);
-INSERT INTO login_config VALUES('global', 'order', 'testauth');
+INSERT INTO login_config VALUES('global', 'enabled', 'testauth');
 '''
 
 USERS_TEMPLATE='''
@@ -92,8 +92,9 @@ if __name__ == '__main__':
 
     penv = dict()
     penv.update(os.environ)
-    penv['PYTHONPATH'] = './'
+    penv['PYTHONPATH'] = os.getcwd()
 
+    exe = os.path.join(os.getcwd(), 'ipsilon/ipsilon')
 
     if args['cleanup']:
         shutil.rmtree(args['workdir'])
@@ -103,5 +104,12 @@ if __name__ == '__main__':
     else:
         conf = os.path.join(args['workdir'], 'ipsilon.conf')
 
-    p = subprocess.Popen(['./ipsilon/ipsilon', conf], env=penv)
+    if not os.path.exists(os.path.join(args['workdir'], 'ui')):
+        os.symlink(os.path.join(os.getcwd(), 'ui'),
+                   os.path.join(args['workdir'], 'ui'))
+
+
+    os.chdir(args['workdir'])
+
+    p = subprocess.Popen([exe, conf], env=penv)
     p.wait()