Merge pull request #980 from gavindsouza/playbooks-fix

.travis.yml

@@ -58,17 +58,17 @@ matrix:
   - name: "Python 3.6 Easy Install"
     python: 3.6
     env: TEST=easy_install
-    script: sudo python $TRAVIS_BUILD_DIR/playbooks/install.py --user travis --run-travis --production --verbose
+    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
 
   - name: "Python 3.7 Easy Install"
     python: 3.7
     env: TEST=easy_install
-    script: sudo python $TRAVIS_BUILD_DIR/playbooks/install.py --user travis --run-travis --production --verbose
+    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
 
   - name: "Python 3.8 Easy Install"
     python: 3.8
     env: TEST=easy_install
-    script: sudo python $TRAVIS_BUILD_DIR/playbooks/install.py --user travis --run-travis --production --verbose
+    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
 
 install:
   - pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1

MANIFEST.in

@@ -1,7 +1,9 @@
 include *.md
 include *.py
 recursive-include bench *.conf
+recursive-include bench *.sh
 recursive-include bench *.py
 recursive-include bench *.txt
 recursive-include bench *.json
 recursive-include bench/config/templates *
+recursive-include bench/playbooks *

README.md

@@ -132,7 +132,7 @@ You need to install the following packages for the script to run:
 Download the Easy Install script and execute it:
 
 ```sh
-$ wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
+$ wget https://raw.githubusercontent.com/frappe/bench/develop/install.py
 $ python3 install.py --production
 ```
 
@@ -142,7 +142,7 @@ When the setup is complete, you will be able to access the system at `http://<yo
 
 #### Troubleshooting
 
-In case the setup fails, the log file is saved under `/tmp/logs/install_bench.log`. You may then: 
+In case the setup fails, the log file is saved under `/tmp/logs/install_bench.log`. You may then:
 
  - Create an Issue in this repository with the log file attached.
  - Search for an existing issue or post the log file on the [Frappe/ERPNext Discuss Forum](https://discuss.erpnext.com/c/bench) with the tag `installation_problem` under "Install/Update" category.

bench/utils.py

@@ -952,7 +952,7 @@ def run_playbook(playbook_name, extra_vars=None, tag=None):
 	if tag:
 		args.extend(['-t', tag])
 
-	subprocess.check_call(args, cwd=os.path.join(os.path.dirname(bench.__path__[0]), 'playbooks'))
+	subprocess.check_call(args, cwd=os.path.join(bench.__path__[0], 'playbooks'))
 
 
 def find_benches(directory=None):

docs/easy_install.md

@@ -36,7 +36,7 @@ If you are on a fresh server and logged in as root, at first create a dedicated
 
 Switch to `[frappe-user]` (using `su [frappe-user]`) and start the setup
 
-	wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
+	wget https://raw.githubusercontent.com/frappe/bench/develop/install.py
 
 
 #### 1. Run the install script

install.py

@@ -359,7 +359,7 @@ def run_playbook(playbook_name, sudo=False, extra_vars=None):
 	else:
 		cwd = os.path.join(os.path.expanduser('~'), 'bench')
 
-	success = subprocess.check_call(args, cwd=os.path.join(cwd, 'playbooks'), stdout=log_stream, stderr=sys.stderr)
+	success = subprocess.check_call(args, cwd=os.path.join(cwd, 'bench', 'playbooks'), stdout=log_stream, stderr=sys.stderr)
 	return success
 
 

setup.py

@@ -1,6 +1,4 @@
-from setuptools import setup, find_packages
-import re, ast
-
+from setuptools import find_packages, setup
 from bench import PROJECT_NAME, VERSION
 
 with open('requirements.txt') as f:

vm/scripts/debian_family/install_erpnext_develop.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -eux
 
 # Install ERPNext
-wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
+wget https://raw.githubusercontent.com/frappe/bench/develop/install.py
 python install.py --develop --user frappe --mysql-root-password frappe --admin-password admin

vm/scripts/debian_family/install_erpnext_production.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -eux
 
 # Install ERPNext
-wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
+wget https://raw.githubusercontent.com/frappe/bench/develop/install.py
 python install.py --production --user frappe --mysql-root-password frappe --admin-password admin