From 02f519ae9b28e650a624122d2502b48030edfe16 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jan 2022 16:02:16 +0100
Subject: [PATCH] try && as connection

---
 deployment/bare_metal/start.sh | 82 ++++++++++++++--------------------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index fd052579c..82b2a0f1d 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -50,15 +50,11 @@ pm2 stop gradido-admin
 # git
 BRANCH=${1:-master}
 echo "Starting with git pull - branch:$BRANCH<br>" >> $UPDATE_HTML
-update_git(){
-  cd $PROJECT_ROOT
-  git fetch origin $BRANCH
-  git checkout $BRANCH
-  git pull
-  export BUILD_COMMIT="$(git rev-parse HEAD)"
-}
-update_git
-
+cd $PROJECT_ROOT && \
+git fetch origin $BRANCH && \
+git checkout $BRANCH && \
+git pull && \
+export BUILD_COMMIT="$(git rev-parse HEAD)"
 
 # Generate gradido.conf from template
 echo 'Generate new gradido nginx config<br>' >> $UPDATE_HTML
@@ -78,55 +74,43 @@ 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
-  if [ "$DEPLOY_SEED_DATA" = "true" ]; then
-    yarn dev_up
-    yarn dev_reset
-    yarn seed 
-  else
-    yarn up
-  fi
-}
-update_database
+#cd $PROJECT_ROOT/database
+#yarn install
+#yarn build
+#if [ "$DEPLOY_SEED_DATA" = "true" ]; then
+#  yarn dev_up
+#  yarn dev_reset
+#  yarn seed 
+#else
+#  yarn up
+#fi
 
 # Install & build backend
 echo 'Updating backend<br>' >> $UPDATE_HTML
-update_backend() {
-  cd $PROJECT_ROOT/backend
-  yarn install
-  yarn build
-  pm2 delete gradido-backend
-  pm2 start --name gradido-backend "yarn start" --no-treekill
-  pm2 save
-}
-update_backend
+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
-update_frontend() {
-  cd $PROJECT_ROOT/frontend && 
-  yarn install
-  yarn build
-  pm2 delete gradido-frontend
-  pm2 start --name gradido-frontend "yarn start"
-  pm2 save
-}
-update_frontend
+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
-update_admin() {
-  cd $PROJECT_ROOT/admin
-  yarn install
-  yarn build
-  pm2 delete gradido-admin
-  pm2 start --name gradido-admin "yarn start"
-  pm2 save
-}
-update_admin
+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
 echo 'Configuring nginx to serve gradido again<br>' >> $UPDATE_HTML