From 9ac4254b25e832a347428ed8eebede43d0dcaa6f Mon Sep 17 00:00:00 2001
From: Arturs Sosins <ar2rsawseen@gmail.com>
Date: Thu, 5 Nov 2020 16:48:14 +0200
Subject: [PATCH] [upgrade] make sure we run upgrade both on combined and stand
 along scripts

---
 bin/upgrade/20.11/upgrade.sh    | 2 +-
 bin/upgrade/20.11/upgrade_db.sh | 4 ++++
 bin/upgrade/20.11/upgrade_fs.sh | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/upgrade/20.11/upgrade.sh b/bin/upgrade/20.11/upgrade.sh
index 0545cafb039..54565dd038e 100644
--- a/bin/upgrade/20.11/upgrade.sh
+++ b/bin/upgrade/20.11/upgrade.sh
@@ -10,4 +10,4 @@ fi
 if [ -f "$DIR/upgrade_db.sh" ]; then
     bash "$DIR/upgrade_db.sh" combined 2>&1 | tee -a "$DIR/../../../log/countly-upgrade-db-$VERSION-$DATE.log"
 fi
-countly start
+countly upgrade
diff --git a/bin/upgrade/20.11/upgrade_db.sh b/bin/upgrade/20.11/upgrade_db.sh
index a287bd704be..02ba7b78052 100644
--- a/bin/upgrade/20.11/upgrade_db.sh
+++ b/bin/upgrade/20.11/upgrade_db.sh
@@ -48,6 +48,10 @@ then
     
     #add indexes
     nodejs "$DIR/scripts/add_indexes.js"
+    
+    if [ "$1" != "combined" ]; then
+        countly upgrade;
+    fi
 
     #call after check
     countly check after upgrade db "$VER"
diff --git a/bin/upgrade/20.11/upgrade_fs.sh b/bin/upgrade/20.11/upgrade_fs.sh
index 41319b0f0dc..0a68b66a0c4 100644
--- a/bin/upgrade/20.11/upgrade_fs.sh
+++ b/bin/upgrade/20.11/upgrade_fs.sh
@@ -68,8 +68,6 @@ then
     rm -rf "$DIR/../node_modules"
     
     (cd "$DIR/.." && sudo npm install --unsafe-perm && sudo npm install argon2 --build-from-source)
-    countly restart
-
 
     countly plugin upgrade star-rating
     countly plugin upgrade users
@@ -93,7 +91,11 @@ then
     countly update sdk-web
 
     #install dependencies, process files and restart countly
-    countly task dist-all
+    if [ "$1" != "combined" ]; then
+        countly upgrade;
+    else
+        countly task dist-all;
+    fi
 
     #call after check
     countly check after upgrade fs "$VER"