Merge remote-tracking branch 'origin/master'

deploy/deploy.sh

@@ -3,43 +3,38 @@ set -e
 
 LOG=/var/log/bssapp_deploy.log
 
-echo "==============================" >> $LOG
-echo "🚀 DEPLOY START $(date)" >> $LOG
-echo "==============================" >> $LOG
+exec >> $LOG 2>&1
+
+echo "=============================="
+echo "🚀 DEPLOY START $(date)"
+echo "=============================="
 
 cd /opt/bssapp
 
-echo "== STOP SERVICE ==" >> $LOG
+echo "== STOP SERVICE =="
 systemctl stop bssapp || true
 
-echo "== GIT SYNC ==" >> $LOG
-git fetch origin >> $LOG 2>&1
-git reset --hard origin/master >> $LOG 2>&1
-git clean -fdx >> $LOG 2>&1
+echo "== GIT SYNC =="
+git fetch origin
+git reset --hard origin/master
+git clean -fdx
 
-echo "== BUILD UI ==" >> $LOG
+echo "== BUILD UI =="
 cd ui
-
-npm install >> $LOG 2>&1
-npm run build >> $LOG 2>&1
-
-echo "== COPY UI ==" >> $LOG
-rm -rf ../svc/public/*
-cp -r dist/spa/* ../svc/public/
-
+npm install
+npm run build
 cd ..
 
-echo "== BUILD BACKEND ==" >> $LOG
+echo "== COPY UI =="
+rm -rf svc/public/*
+cp -r ui/dist/spa/* svc/public/
+
+echo "== BUILD BACKEND =="
 cd svc
-
-go mod tidy >> $LOG 2>&1
-go build -o bssapp >> $LOG 2>&1
-
+go build -o bssapp
 cd ..
 
-echo "== START SERVICE ==" >> $LOG
+echo "== START SERVICE =="
 systemctl start bssapp
 
-echo "==============================" >> $LOG
-echo "✅ DEPLOY FINISHED" >> $LOG
-echo "==============================" >> $LOG
+echo "✅ DEPLOY DONE $(date)"