From d00770e42f347279fe4fb10e9e995cc6ffceaaeb Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 7 Mar 2020 05:33:32 +0530 Subject: [PATCH] fix: install_app set branch --- build/common/worker/install_app.sh | 3 +-- build/erpnext-nginx/install_app.sh | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh index ac71cc6a..c378be17 100755 --- a/build/common/worker/install_app.sh +++ b/build/common/worker/install_app.sh @@ -10,8 +10,7 @@ cd /home/frappe/frappe-bench/ cd ./apps -[ "${APP_BRANCH}" ] && \ - BRANCH="-b ${APP_BRANCH}" +[ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file diff --git a/build/erpnext-nginx/install_app.sh b/build/erpnext-nginx/install_app.sh index aa3cd98c..a01e957b 100644 --- a/build/erpnext-nginx/install_app.sh +++ b/build/erpnext-nginx/install_app.sh @@ -4,8 +4,7 @@ APP_NAME=${1} APP_REPO=${2} APP_BRANCH=${3} -[ "${APP_BRANCH}" ] && \ - BRANCH="-b ${APP_BRANCH}" +[ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" cd /home/frappe/frappe-bench mkdir -p /home/frappe/frappe-bench/sites @@ -13,7 +12,7 @@ echo "frappe\n${APP_NAME}" > /home/frappe/frappe-bench/sites/apps.txt install_packages git python2 -mkdir -p apps sites/assets +mkdir -p apps sites/assets cd apps git clone --depth 1 https://github.com/frappe/frappe ${BRANCH} git clone --depth 1 ${APP_REPO} ${BRANCH}