From f332bae932bc1187593d29f70340affb2641cbbf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jan 2022 16:22:54 +0100
Subject: [PATCH] reverted all trys to fix things within the script, use
 /bin/bash to spawn interpret the script

---
 backend/src/webhook/github.ts  |  7 ++--
 deployment/bare_metal/start.sh | 61 +++++++++++++++-------------------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/backend/src/webhook/github.ts b/backend/src/webhook/github.ts
index d1d5034d3..df14726ab 100644
--- a/backend/src/webhook/github.ts
+++ b/backend/src/webhook/github.ts
@@ -19,8 +19,11 @@ export const githubWebhook = async (req: any, res: any): Promise<void> => {
     if (payload.ref === `refs/heads/${CONFIG.WEBHOOK_GITHUB_BRANCH}`) {
       // spawn shell and detach process to allow killing of parent process in the update script
       const child = spawn(
-        path.join(__dirname, '../../../deployment/bare_metal/start.sh'),
-        [CONFIG.WEBHOOK_GITHUB_BRANCH],
+        '/bin/bash',
+        [
+          path.join(__dirname, '../../../deployment/bare_metal/start.sh'),
+          CONFIG.WEBHOOK_GITHUB_BRANCH,
+        ],
         {
           detached: true,
           stdio: ['ignore', 'ignore', 'ignore'],
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index a8bfee1c4..ce4846ce2 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -50,10 +50,10 @@ pm2 stop gradido-admin
 # git
 BRANCH=${1:-master}
 echo "Starting with git pull - branch:$BRANCH<br>" >> $UPDATE_HTML
-cd $PROJECT_ROOT && \
-git fetch origin $BRANCH && \
-git checkout $BRANCH && \
-git pull && \
+cd $PROJECT_ROOT
+git fetch origin $BRANCH
+git checkout $BRANCH
+git pull
 export BUILD_COMMIT="$(git rev-parse HEAD)"
 
 # Generate gradido.conf from template
@@ -74,51 +74,42 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE
 
 # Install & build database
 echo 'Updating database<br>' >> $UPDATE_HTML
-update_database(){
-  cd $PROJECT_ROOT/database && \
-  yarn install && \
-  yarn build && \
-  yarn up
-}
-update_database_seed(){
-  cd $PROJECT_ROOT/database && \
-  yarn install && \
-  yarn build && \
-  yarn dev_up && \
-  yarn dev_reset && \
-  yarn seed
-}
+cd $PROJECT_ROOT/database
+yarn install
+yarn build
 if [ "$DEPLOY_SEED_DATA" = "true" ]; then
-  update_database
+  yarn dev_up
+  yarn dev_reset
+  yarn seed 
 else
-  update_database_seed
+  yarn up
 fi
 
 # Install & build backend
 echo 'Updating backend<br>' >> $UPDATE_HTML
-cd $PROJECT_ROOT/backend && \
-yarn install && \
-yarn build && \
-pm2 delete gradido-backend && \
-pm2 start --name gradido-backend "yarn start" --no-treekill && \
+cd $PROJECT_ROOT/backend
+yarn install
+yarn build
+pm2 delete gradido-backend
+pm2 start --name gradido-backend "yarn start" --no-treekill
 pm2 save
 
 # Install & build frontend
 echo 'Updating frontend<br>' >> $UPDATE_HTML
-cd $PROJECT_ROOT/frontend && \
-yarn install && \
-yarn build && \
-pm2 delete gradido-frontend && \
-pm2 start --name gradido-frontend "yarn start" && \
+cd $PROJECT_ROOT/frontend
+yarn install
+yarn build
+pm2 delete gradido-frontend
+pm2 start --name gradido-frontend "yarn start"
 pm2 save
 
 # Install & build admin
 echo 'Updating admin<br>' >> $UPDATE_HTML
-cd $PROJECT_ROOT/admin && \
-yarn install && \
-yarn build && \
-pm2 delete gradido-admin && \
-pm2 start --name gradido-admin "yarn start" && \
+cd $PROJECT_ROOT/admin
+yarn install
+yarn build
+pm2 delete gradido-admin
+pm2 start --name gradido-admin "yarn start"
 pm2 save
 
 # let nginx showing gradido