From ee3c4147a446cdf8d73e2cfaa8ecb089cdcdf59c Mon Sep 17 00:00:00 2001 From: chabad360 Date: Thu, 2 Aug 2018 17:16:58 -0700 Subject: [PATCH] added start to dbanch and testing if optopt works --- .travis.yml | 2 +- dbench | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 480a8b47..83d0be29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: install: - ./dbench --setup -u - - ./dbench --init + - ./dbench --init site2.local - ./dbench --start - pip install --upgrade virtualenv - virtualenv -p python3 testenv diff --git a/dbench b/dbench index f5e53186..99a2060c 100644 --- a/dbench +++ b/dbench @@ -106,19 +106,34 @@ if [ $init == 1 ]; then if ! $site; then site="site1.local" fi + frappe_installer $site + + if [ $mgr == 1 ]; then + echo "installing bench manager" + docker exec -it frappe bash -c "bench setup manager" + fi + + if [ $erp == 1 ]; then + echo "installing erpnext" + docker exec -it frappe bash -c "bench get-app erpnext" + docker exec -it frappe bash -c "bench --site $site install-app erpnext" + docker exec -it -u root frappe bash -c "bench --site $site set-config \"developer_mode\" 1 && bench clear-cache" + echo "finished" + fi + + if [ $d == 1 ]; then + docker exec -it -u root frappe bash -c "bench --site $site set-config \"developer_mode\" 1 && bench clear-cache" + fi + exit 0 fi -if [ $mgr == 1 ]; then - docker exec -it frappe bash -c "bench setup manager" -fi - -if [ $erp == 1 ]; then - echo "installing erpnext" - docker exec -it frappe bash -c "bench get-app erpnext" - docker exec -it frappe bash -c "bench --site $site install-app erpnext" - docker exec -it -u root frappe bash -c "bench --site $site set-config \"developer_mode\" 1 && bench clear-cache" - echo "finished" +if [ $start == 1 ]; then + docker-compose start + ./dbench -a + if [ $bench == 1 ]; then + docker exec -it frappe bash -c "bench start" + fi fi if [ $d == 1 ]; then