Merge pull request #12202 from YevhenBondarenko/feature/upgrade-scripts-improvements

removed FROM_VERSION check from upgrade scripts

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
 

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 \

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 \

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

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

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