From 137a78a6b0fa826a947deb0d07bb05bcf1fafe70 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 8 Sep 2020 17:13:26 +0530 Subject: [PATCH 1/3] feat: pitch erpnext support to VM users --- vm/scripts/set_message_production.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/scripts/set_message_production.sh b/vm/scripts/set_message_production.sh index 74182ca6..2fddcb77 100644 --- a/vm/scripts/set_message_production.sh +++ b/vm/scripts/set_message_production.sh @@ -6,7 +6,7 @@ message=" Please access ERPNext by going to http://localhost:8080 on the host system. The username is \"Administrator\" and password is \"admin\" - Do consider donating at https://frappe.io/buy + Consider buying professional support from us at https://erpnext.com/support To update, login as username: frappe From bc2eb7b4cb02e795607c668ade5606c1bc82d10c Mon Sep 17 00:00:00 2001 From: gavin Date: Wed, 9 Sep 2020 15:03:50 +0530 Subject: [PATCH 2/3] docs: Update bench CLI update method --- docs/commands_and_usage.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/commands_and_usage.md b/docs/commands_and_usage.md index 92ad33bc..ed71cc59 100644 --- a/docs/commands_and_usage.md +++ b/docs/commands_and_usage.md @@ -2,9 +2,14 @@ * Updating - Currently, `bench update` can be run from any directory however the context of the command changes. If run from a bench directory, the vanilla command itself updates all apps, runs migrations and backs up all sites. +To update the bench CLI tool, depending on your method of installation, you may use - bench update + pip3 install -U frappe-bench + + +To backup, update all apps and sites on your bench, you may use + + bench update To manually update the bench, run `bench update` to update all the apps, run From 1237d604ce9dd78a1644e7f33f3da2dd03655ee9 Mon Sep 17 00:00:00 2001 From: gavin Date: Wed, 9 Sep 2020 15:38:55 +0530 Subject: [PATCH 3/3] docs: Update operation fix --- docs/bench_usage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/bench_usage.md b/docs/bench_usage.md index cf9a0364..807d021f 100644 --- a/docs/bench_usage.md +++ b/docs/bench_usage.md @@ -72,7 +72,7 @@ These commands belong directly to the bench group so they can be invoked directl - **init**: Initialize a new bench instance in the specified path. This sets up a complete bench folder with an `apps` folder which contains all the Frappe apps available in the current bench, `sites` folder that stores all site data seperated by individual site folders, `config` folder that contains your redis, NGINX and supervisor configuration files. The `env` folder consists of all python dependencies the current bench and installed Frappe applications have. - **restart**: Restart web, supervisor, systemd processes units. Used in production setup. - - **update**: Updates bench tool and if executed in a bench directory, without any flags will backup, pull, setup requirements, build, run patches and restart bench. Using specific flags will only do certain tasks instead of all. + - **update**: If executed in a bench directory, without any flags will backup, pull, setup requirements, build, run patches and restart bench. Using specific flags will only do certain tasks instead of all. - **migrate-env**: Migrate Virtual Environment to desired Python version. This regenerates the `env` folder with the specified Python version. - **retry-upgrade**: Retry a failed upgrade - **disable-production**: Disables production environment for the bench.