thingsboard-aplcache

install_dev_db scripts updated to account for SQL_DATA_FOLDER

9/28/2017 9:09:37 PM

mp-loki

Commit: 7659ef4

Tree: 918f37b

Parents: ec91b3b

Changes

application/src/main/scripts/install/install_dev_db.sh 2(+1 -1)

application/src/main/scripts/windows/install_dev_db.bat 6(+4 -2)

Details

application/src/main/scripts/install/install_dev_db.sh 2(+1 -1)

diff --git a/application/src/main/scripts/install/install_dev_db.sh b/application/src/main/scripts/install/install_dev_db.sh
index fbab171..8f64ad0 100644
--- a/application/src/main/scripts/install/install_dev_db.sh
+++ b/application/src/main/scripts/install/install_dev_db.sh
@@ -25,7 +25,7 @@ loadDemo=true
 
 export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@"
 export LOADER_PATH=${BASE}/conf,${BASE}/extensions
-export SQL_DATA_FOLDER=/tmp
+export SQL_DATA_FOLDER=${SQL_DATA_FOLDER:-/tmp}
 
 
 run_user=thingsboard

application/src/main/scripts/windows/install_dev_db.bat 6(+4 -2)

diff --git a/application/src/main/scripts/windows/install_dev_db.bat b/application/src/main/scripts/windows/install_dev_db.bat
index c993e26..cf8c98c 100644
--- a/application/src/main/scripts/windows/install_dev_db.bat
+++ b/application/src/main/scripts/windows/install_dev_db.bat
@@ -4,12 +4,14 @@ setlocal ENABLEEXTENSIONS
 
 SET BASE=${project.basedir}\target
 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
-SET SQL_DATA_FOLDER=%~dp0\tmp
+
 SET jarfile=%BASE%\thingsboard-${project.version}-boot.jar
 SET installDir=%BASE%\data
 SET loadDemo=true
 
-SET SQL_DATA_FOLDER=/tmp
+IF "%SQL_DATA_FOLDER%" == "" (	
+	SET SQL_DATA_FOLDER=/tmp
+)
 
 java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
                     -Dinstall.data_dir=%installDir%^