From db4327568f54f900b94017254c30dbc10ef3f57e Mon Sep 17 00:00:00 2001
From: Pratik Vyas <m@pd.io>
Date: Fri, 11 Jul 2014 10:25:20 +0530
Subject: [PATCH] fixes to bench init

---
 bench/app.py   |  2 +-
 bench/utils.py | 14 +++++++++-----
 setup.py       |  5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bench/app.py b/bench/app.py
index c6f87037..a742a284 100644
--- a/bench/app.py
+++ b/bench/app.py
@@ -25,7 +25,7 @@ def new_app(app, bench='.'):
 	install_app(app, bench=bench)
 
 def install_app(app, bench='.'):
-	exec_cmd("{pip} install -e {app}".format(pip=os.path.join(bench, 'env', 'bin', 'pip'), app=os.path.join('apps', app)))
+	exec_cmd("{pip} install -e {app}".format(pip=os.path.join(bench, 'env', 'bin', 'pip'), app=os.path.join(bench, 'apps', app)))
 	add_to_appstxt(app, bench=bench)
 
 def pull_all_apps(bench='.'):
diff --git a/bench/utils.py b/bench/utils.py
index 0b0dbb18..9a52bccd 100644
--- a/bench/utils.py
+++ b/bench/utils.py
@@ -11,6 +11,7 @@ def get_frappe(bench='.'):
 	return frappe
 
 def init(path):
+	from .app import get_app
 	if os.path.exists(path):
 		print 'Directory {} already exists!'.format(path)
 		sys.exit(1)
@@ -19,6 +20,9 @@ def init(path):
 	for dirname in ('apps', 'sites', 'config', 'logs'):
 		os.mkdir(os.path.join(path, dirname))
 	setup_env(bench=path)
+	get_app('frappe', 'https://github.com/frappe/frappe.git', bench=path)
+	setup_backups(bench=path)
+	setup_auto_update(bench=path)
 
 def exec_cmd(cmd, cwd='.'):
 	try:
@@ -54,12 +58,12 @@ def get_bench_dir(bench='.'):
 	return os.path.abspath(bench)
 
 def setup_auto_update():
-	exec_cmd('echo \"`crontab -l`\" | uniq | sed -e \"a0 10 * * * cd {bench_dir} &&  {bench} update\" | grep -v "^$" | uniq | crontab'.format(bench_dir=get_bench_dir(),
-	bench=os.path.join(get_bench_dir(), 'env', 'bin', 'bench')))
+	exec_cmd('echo \"`crontab -l`\" | uniq | sed -e \"a0 10 * * * cd {bench_dir} &&  {bench} update\" | grep -v "^$" | uniq | crontab'.format(bench_dir=get_bench_dir(bench=bench),
+	bench=os.path.join(get_bench_dir(bench=bench), 'env', 'bin', 'bench')))
 
-def setup_backups():
-	exec_cmd('echo \"`crontab -l`\" | uniq | sed -e \"a0 */6 * * * cd {sites_dir} &&  {frappe} --backup all\" | grep -v "^$" | uniq | crontab'.format(sites_dir=get_sites_dir(),
-	frappe=get_frappe()))
+def setup_backups(bench='.'):
+	exec_cmd('echo \"`crontab -l`\" | uniq | sed -e \"a0 */6 * * * cd {sites_dir} &&  {frappe} --backup all\" | grep -v "^$" | uniq | crontab'.format(sites_dir=get_sites_dir(bench=bench),
+	frappe=get_frappe(bench=bench)))
 
 def update_bench():
 	cwd = os.path.dirname(os.path.abspath(__file__))
diff --git a/setup.py b/setup.py
index 60652720..e07d4b8b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,13 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
     name='bench',
     version='0.1',
-    py_modules=['bench'],
+    py_modules=find_packages()
     include_package_data=True,
     install_requires=[
         'Click',
+        'jinja2',
     ],
     entry_points='''
 [console_scripts]