From ef2dd58c1bdd407646e002867188a99d0d3fb283 Mon Sep 17 00:00:00 2001
From: OscarSotoSanchez <oscarsotosanchez@gmail.com>
Date: Wed, 6 May 2020 13:00:06 +0200
Subject: [PATCH] openvidu install script udated

---
 .../install_openvidu.sh                       | 21 +++++++++++--------
 .../docker/openvidu-docker-compose/openvidu   | 15 +------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/openvidu-server/docker/openvidu-docker-compose/install_openvidu.sh b/openvidu-server/docker/openvidu-docker-compose/install_openvidu.sh
index d6b2adf6..c6caaba8 100755
--- a/openvidu-server/docker/openvidu-docker-compose/install_openvidu.sh
+++ b/openvidu-server/docker/openvidu-docker-compose/install_openvidu.sh
@@ -122,14 +122,14 @@ upgrade_ov() {
      USE_OV_CALL=$(grep -E '^        image: openvidu/openvidu-call:2.12.0$' "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.override.yml" | tr -d '[:space:]')
 
      printf '\n     => Moving previous installation files:'
-     mv "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" "${ROLL_BACK_FOLDER}"
+     mv "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.yml" "${ROLL_BACK_FOLDER}" || fatal_error "Error while moving previous 'docker-compose.yml'"
      printf '\n          - docker-compose.yml'
-     mv "${OPENVIDU_PREVIOUS_FOLDER}/openvidu" "${ROLL_BACK_FOLDER}"
+     mv "${OPENVIDU_PREVIOUS_FOLDER}/openvidu" "${ROLL_BACK_FOLDER}" || fatal_error "Error while moving previous 'openvidu'"
      printf '\n          - openvidu'
-     mv "${OPENVIDU_PREVIOUS_FOLDER}/readme.md" "${ROLL_BACK_FOLDER}"
+     mv "${OPENVIDU_PREVIOUS_FOLDER}/readme.md" "${ROLL_BACK_FOLDER}" || fatal_error "Error while moving previous 'readme.md'"
      printf '\n          - readme.md'
      if [ ! -z "${USE_OV_CALL}" ]; then
-          mv "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.override.yml" "${ROLL_BACK_FOLDER}"
+          mv "${OPENVIDU_PREVIOUS_FOLDER}/docker-compose.override.yml" "${ROLL_BACK_FOLDER}" || fatal_error "Error while moving previous 'docker-compose.override.yml'"
           printf '\n          - docker-compose.override.yml'
      fi
 
@@ -173,15 +173,18 @@ upgrade_ov() {
      printf '\n     Openvidu Platform successfully upgrade.'
      printf '\n     ======================================='
      printf '\n'
-     printf "\n     A new file 'docker-compose.yml' has been created with the new services"
+     printf "\n     1. A new file 'docker-compose.yml' has been created with the new services"
      printf '\n'
-     printf "\n     The current file '.env' has been kept but a new file '.env-VERSION' has been created." 
-     printf "\n     Please check the new file '.env-VERSION' use your data from the file '.env' and replace it'"
+     printf "\n     2. The current file '.env' has been kept but a new file '.env-VERSION' has been created." 
+     printf "\n     Please check the new file '.env-VERSION' use your data from the file '.env' and replace it"
      printf '\n     to have the new improvements.' 
      printf '\n'
-     printf "\n     If you were using Openvidu Call it has been updated in the file 'docker-compose.override.yml'"
+     printf "\n     3. If you were using Openvidu Call it has been updated in the file 'docker-compose.override.yml'"
      printf "\n     however if you are using your own application a file called 'docker-compose.override.yml-VERSION'"
-     printf "\n     has been created with the latest version of Openvidu Call, you can delete it or use it if you wish.'"
+     printf "\n     has been created with the latest version of Openvidu Call, you can delete it or use it if you wish."
+     printf '\n'
+     printf '\n     4. Start new version of Openvidu'
+     printf '\n     $ ./openvidu start'
      printf '\n'
      printf '\n     For more information, check readme.md'
      printf '\n'
diff --git a/openvidu-server/docker/openvidu-docker-compose/openvidu b/openvidu-server/docker/openvidu-docker-compose/openvidu
index fa0eda4a..eb18b3b4 100755
--- a/openvidu-server/docker/openvidu-docker-compose/openvidu
+++ b/openvidu-server/docker/openvidu-docker-compose/openvidu
@@ -9,6 +9,7 @@ upgrade_ov() {
   if [ "$HTTP_STATUS" == "200" ]; then
     printf "\n    => Downloading new Version"
     printf "\n"
+    docker-compose down
     curl ${UPGRADE_SCRIPT_URL//OVVERSION/$1} | bash -s upgrade
   else
      printf "\n     =======¡ERROR!======="
@@ -59,20 +60,6 @@ case $1 in
       upgrade_ov "$2"
     fi
     ;;
-  upgrade-restart)
-    OLD_OPENVIDU_FOLDER=$(ls -tda .old* | head -1)
-
-    if [ ! -z ${OLD_OPENVIDU_FOLDER} ]; then
-      docker-compose -f "${OLD_OPENVIDU_FOLDER}/docker-compose.yml" down
-      docker-compose up -d
-      docker-compose logs -f openvidu-server
-    else
-      printf "\n     =======¡ERROR!======="
-      printf "\n     There are no Openvidu CE previous updates"
-      printf "\n"
-      exit 0
-    fi
-    ;;
   *)
     usage
     ;;