Merge branch 'develop' into referrer-policy

README.md

@@ -141,12 +141,19 @@ In case the setup fails, the log file is saved under `/tmp/logs/install_bench.lo
  - 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.
 
-For more information and advanced setup instructions, check out the [Easy Install Documentation](https://github.com/frappe/bench/blob/master/docs/easy_install.md).
+For more information and advanced setup instructions, check out the [Easy Install Documentation](https://github.com/frappe/bench/blob/develop/docs/easy_install.md).
 
 
 ### Manual Installation
 
-Although not recommended, some might want to manually setup a bench instance locally for development. To quickly get started on installing bench the hard way, you can follow [Installing Bench and Frappe](https://frappe.io/docs/user/en/installation).
+Some might want to manually setup a bench instance locally for development. To quickly get started on installing bench the hard way, you can follow the guide on [Installing Bench and the Frappe Framework](https://frappe.io/docs/user/en/installation).
+
+You'll have to set up the system dependencies required for setting up a Frappe Environment. Checkout [docs/installation](https://github.com/frappe/bench/blob/develop/docs/installation.md) for more information on this. If you've already set up, install bench via pip:
+
+
+```sh
+$ pip install frappe-bench
+```
 
 For more extensive distribution-dependent documentation, check out the following guides:
 
@@ -200,12 +207,12 @@ For more extensive distribution-dependent documentation, check out the following
 	```
 
 
-For more in-depth information on commands and their usage, follow [Commands and Usage](https://github.com/frappe/bench/blob/master/docs/commands_and_usage.md). As for a consolidated list of bench commands, check out [Bench Usage](https://github.com/frappe/bench/blob/master/docs/bench_usage.md).
+For more in-depth information on commands and their usage, follow [Commands and Usage](https://github.com/frappe/bench/blob/develop/docs/commands_and_usage.md). As for a consolidated list of bench commands, check out [Bench Usage](https://github.com/frappe/bench/blob/develop/docs/bench_usage.md).
 
 
 ## Custom Bench Commands
 
-If you wish to extend the capabilities of bench with your own custom Frappe Application, you may follow [Adding Custom Bench Commands](https://github.com/frappe/bench/blob/master/docs/bench_custom_cmd.md).
+If you wish to extend the capabilities of bench with your own custom Frappe Application, you may follow [Adding Custom Bench Commands](https://github.com/frappe/bench/blob/develop/docs/bench_custom_cmd.md).
 
 
 ## Bench Manager

bench/app.py

@@ -108,7 +108,7 @@ def get_app(git_url, branch=None, bench_path='.', skip_assets=False, verbose=Fal
 					sys.exit(1)
 
 		# Gets repo name from URL
-		repo_name = git_url.rsplit('/', 1)[1].rsplit('.', 1)[0]
+		repo_name = git_url.rstrip('/').rsplit('/', 1)[1].rsplit('.', 1)[0]
 		shallow_clone = '--depth 1' if check_git_for_shallow_clone() else ''
 		branch = '--branch {branch}'.format(branch=branch) if branch else ''
 	else:

bench/config/templates/Procfile

@@ -11,9 +11,9 @@ watch: bench watch
 {% endif %}
 {% if use_rq -%}
 schedule: bench schedule
-worker_short: bench worker --queue short --quiet
+worker_short: bench worker --queue short 1>> logs/worker.log 2>> logs/worker.error.log
-worker_long: bench worker --queue long --quiet
+worker_long: bench worker --queue long 1>> logs/worker.log 2>> logs/worker.error.log
-worker_default: bench worker --queue default --quiet
+worker_default: bench worker --queue default 1>> logs/worker.log 2>> logs/worker.error.log
 {% else %}
 workerbeat: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app beat -s scheduler.schedule'
 worker: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker -n jobs@%h -Ofair --soft-time-limit 360 --time-limit 390'

docs/installation.md

@@ -30,9 +30,6 @@ To manually install frappe/erpnext, you can follow this [this wiki](https://gith
 
 #### 2. Install Bench
 
-Install bench as a *non root* user,
+Install the latest bench using pip
 
-	git clone https://github.com/frappe/bench ~/.bench
+	pip3 install frappe-bench
-	pip3 install --user -e ~/.bench
-
-Note: Please do not remove the bench directory the above commands will create