From 0af23059320768ada2d26605a947087f4a0bf822 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 5 Dec 2024 21:40:36 +0100
Subject: [PATCH] removed FROM_VERSION check from upgrade scripts

---
 docker/docker-upgrade-tb.sh                      | 8 +-------
 msa/tb-node/docker/start-tb-node.sh              | 8 ++------
 msa/tb/docker/upgrade-tb.sh                      | 7 +------
 packaging/java/scripts/install/upgrade.sh        | 8 +-------
 packaging/java/scripts/install/upgrade_dev_db.sh | 8 +-------
 packaging/java/scripts/windows/upgrade.bat       | 6 ------
 6 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/docker/docker-upgrade-tb.sh b/docker/docker-upgrade-tb.sh
index 41f50c7019..07aa7ef05f 100755
--- a/docker/docker-upgrade-tb.sh
+++ b/docker/docker-upgrade-tb.sh
@@ -28,13 +28,7 @@ case $i in
 esac
 done
 
-if [[ -z "${FROM_VERSION// }" ]]; then
-    echo "--fromVersion parameter is invalid or unspecified!"
-    echo "Usage: docker-upgrade-tb.sh --fromVersion={VERSION}"
-    exit 1
-else
-    fromVersion="${FROM_VERSION// }"
-fi
+fromVersion="${FROM_VERSION// }"
 
 set -e
 
diff --git a/msa/tb-node/docker/start-tb-node.sh b/msa/tb-node/docker/start-tb-node.sh
index c164954a82..b90553e772 100755
--- a/msa/tb-node/docker/start-tb-node.sh
+++ b/msa/tb-node/docker/start-tb-node.sh
@@ -47,12 +47,8 @@ elif [ "$UPGRADE_TB" == "true" ]; then
 
     echo "Starting ThingsBoard upgrade ..."
 
-    if [[ -z "${FROM_VERSION// }" ]]; then
-        echo "FROM_VERSION variable is invalid or unspecified!"
-        exit 1
-    else
-        fromVersion="${FROM_VERSION// }"
-    fi
+
+    fromVersion="${FROM_VERSION// }"
 
     exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
diff --git a/msa/tb/docker/upgrade-tb.sh b/msa/tb/docker/upgrade-tb.sh
index 545bf4b8d6..3e8f7d804a 100644
--- a/msa/tb/docker/upgrade-tb.sh
+++ b/msa/tb/docker/upgrade-tb.sh
@@ -28,12 +28,7 @@ FROM_VERSION=`cat ${upgradeversion}`
 
 echo "Starting ThingsBoard upgrade ..."
 
-if [[ -z "${FROM_VERSION// }" ]]; then
-    echo "FROM_VERSION variable is invalid or unspecified!"
-    exit 1
-else
-    fromVersion="${FROM_VERSION// }"
-fi
+fromVersion="${FROM_VERSION// }"
 
 java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication \
                 -Dspring.jpa.hibernate.ddl-auto=none \
diff --git a/packaging/java/scripts/install/upgrade.sh b/packaging/java/scripts/install/upgrade.sh
index 2b87b26aa6..07164ef2c8 100755
--- a/packaging/java/scripts/install/upgrade.sh
+++ b/packaging/java/scripts/install/upgrade.sh
@@ -28,13 +28,7 @@ case $i in
 esac
 done
 
-if [[ -z "${FROM_VERSION// }" ]]; then
-    echo "--fromVersion parameter is invalid or unspecified!"
-    echo "Usage: upgrade.sh --fromVersion={VERSION}"
-    exit 1
-else
-    fromVersion="${FROM_VERSION// }"
-fi
+fromVersion="${FROM_VERSION// }"
 
 CONF_FOLDER=${pkg.installFolder}/conf
 configfile=${pkg.name}.conf
diff --git a/packaging/java/scripts/install/upgrade_dev_db.sh b/packaging/java/scripts/install/upgrade_dev_db.sh
index d0c42eaaa6..010f6d3655 100755
--- a/packaging/java/scripts/install/upgrade_dev_db.sh
+++ b/packaging/java/scripts/install/upgrade_dev_db.sh
@@ -28,13 +28,7 @@ case $i in
 esac
 done
 
-if [[ -z "${FROM_VERSION// }" ]]; then
-    echo "--fromVersion parameter is invalid or unspecified!"
-    echo "Usage: upgrade_dev_db.sh --fromVersion={VERSION}"
-    exit 1
-else
-    fromVersion="${FROM_VERSION// }"
-fi
+fromVersion="${FROM_VERSION// }"
 
 BASE=${project.basedir}/target
 CONF_FOLDER=${BASE}/conf
diff --git a/packaging/java/scripts/windows/upgrade.bat b/packaging/java/scripts/windows/upgrade.bat
index b86121b8f1..115eea5244 100644
--- a/packaging/java/scripts/windows/upgrade.bat
+++ b/packaging/java/scripts/windows/upgrade.bat
@@ -15,12 +15,6 @@ IF NOT "%1"=="" (
     GOTO :loop
 )
 
-if not defined fromVersion (
-    echo "--fromVersion parameter is invalid or unspecified!"
-    echo "Usage: upgrade.bat --fromVersion {VERSION}"
-    exit /b 1
-)
-
 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
 SET SQL_DATA_FOLDER=%BASE%\data\sql
 SET jarfile=%BASE%\lib\${pkg.name}.jar