-added ability setting database name;

-upgrade v2.6.18 to new build 3789793770
SCADA-LTS · Jun 21, 2024 · 10369d0 · 10369d0
1 parent b769e72
commit 10369d0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/META-INF/MANIFEST b/META-INF/MANIFEST
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
+pullManifest-Version: 1.0
 Built-By: kamiljarmusik
-Version: 1.4.1
+Version: 1.4.2
diff --git a/mysql/mysql_install.sh b/mysql/mysql_install.sh
@@ -18,6 +18,8 @@ SERVER_BIN_DIR="$MYSQL_HOME/bin";
 CLIENT_BIN_DIR="$SHELL_HOME/bin";
 
 MYSQL_PORT=-1;
+MYSQL_HOST="";
+MYSQL_DATABASE=""
 MYSQL_USERNAME="";
 MYSQL_PASSWORD="";
 MYSQL_ROOT_PASSWORD="";
@@ -88,6 +90,12 @@ if [ ! -d "${SERVER_BIN_DIR}" ] && [ ! -z "${SERVER_MYSQL_DEST}" ]; then
     cp -a "${MY_CNF}" "${COPIED_MY_CNF}";
     cp -a "${INIT_SCHEMA}" "${COPIED_INIT_SCHEMA}";
 
+    while [ -z "${MYSQL_HOST}" ] || ! [[ ${MYSQL_HOST} =~ ${HOSTNAME_REGEX} ]]
+    do
+      echo -n "[MySQL Community Server] Enter hostname: ";
+      read -r MYSQL_HOST;
+    done
+
     while [ ${MYSQL_PORT} -eq -1 ] || ! [[ ${MYSQL_PORT} =~ ${PORT_REGEX} ]]
     do
       echo -n "[MySQL Community Server] Enter port: ";
@@ -96,6 +104,13 @@ if [ ! -d "${SERVER_BIN_DIR}" ] && [ ! -z "${SERVER_MYSQL_DEST}" ]; then
     echo "port = ${MYSQL_PORT}" >> "${COPIED_MY_CNF}";
     echo "mysqlx_port = 3${MYSQL_PORT}" >> "${COPIED_MY_CNF}";
 
+    while [ -z "${MYSQL_DATABASE}" ]
+    do
+      echo -n "[MySQL Community Server] Enter database name: ";
+      read -r MYSQL_DATABASE;
+    done
+    "${JAVA_HOME}"/bin/java -jar ../replace-1.0.jar -o "CREATE DATABASE IF NOT EXISTS scadalts;" -n "CREATE DATABASE IF NOT EXISTS ${MYSQL_DATABASE};" -f "${COPIED_INIT_SCHEMA}";
+
     while [ -z "${MYSQL_USERNAME}" ] || ! [[ ${MYSQL_USERNAME} =~ ${USERNAME_REGEX} ]]
     do
       echo -n "[MySQL Community Server] Enter username: ";
@@ -108,13 +123,7 @@ if [ ! -d "${SERVER_BIN_DIR}" ] && [ ! -z "${SERVER_MYSQL_DEST}" ]; then
       echo -n "[MySQL Community Server] Enter password: ";
       read -r MYSQL_PASSWORD;
     done
-
-    while [ -z "${MYSQL_HOST}" ] || ! [[ ${MYSQL_HOST} =~ ${HOSTNAME_REGEX} ]]
-    do
-      echo -n "[MySQL Community Server] Enter hostname: ";
-      read -r MYSQL_HOST;
-    done
-    "${JAVA_HOME}"/bin/java -jar ../replace-1.0.jar -n "CREATE USER IF NOT EXISTS '${MYSQL_USERNAME}'@'${MYSQL_HOST}' IDENTIFIED BY '';GRANT ALL ON scadalts.* TO '${MYSQL_USERNAME}'@'${MYSQL_HOST}';FLUSH PRIVILEGES;" -f "${COPIED_INIT_SCHEMA}" -d "mysql" -p "${MYSQL_PASSWORD}";
+    "${JAVA_HOME}"/bin/java -jar ../replace-1.0.jar -n "CREATE USER IF NOT EXISTS '${MYSQL_USERNAME}'@'${MYSQL_HOST}' IDENTIFIED BY '';GRANT ALL ON ${MYSQL_DATABASE}.* TO '${MYSQL_USERNAME}'@'${MYSQL_HOST}';FLUSH PRIVILEGES;" -f "${COPIED_INIT_SCHEMA}" -d "mysql" -p "${MYSQL_PASSWORD}";
 
     while [ -z "${MYSQL_ROOT_PASSWORD}" ]
     do
@@ -134,7 +143,7 @@ if [ ! -d "${CLIENT_BIN_DIR}" ] && [ ! -z "${SHELL_MYSQL_DEST}" ]; then
     if [ ! -f "$SHELL_MYSQL_TAR_GZ_FILE" ]; then
       wget "https://dev.mysql.com/get/Downloads/MySQL-Shell/${SHELL_MYSQL_TAR_GZ_FILE}";
     fi
-    tar -xvf "${SHELL_MYSQL_TAR_GZ_FILE}" -C "$SHELL_HOME";
+    tar -xf "${SHELL_MYSQL_TAR_GZ_FILE}" -C "$SHELL_HOME";
     cd "$SHELL_HOME/${SHELL_MYSQL_DEST}";
     mv * "$SHELL_HOME";
     cd ..;

diff --git a/tomcat/Scada-LTS.war b/tomcat/Scada-LTS.war
diff --git a/tomcat/tomcat_config.sh b/tomcat/tomcat_config.sh
@@ -67,7 +67,13 @@ do
     echo -n "[Apache Tomcat Server] Enter database host: ";
     read -r DATABASE_HOSTNAME;
 done
-"${JAVA_HOME}"/bin/java -jar replace-1.0.jar -o "jdbc:mysql://localhost:3308" -n "jdbc:mysql://${DATABASE_HOSTNAME}:${DATABASE_PORT}" -f "${CATALINA_CONTEXT_XML}";
+
+while [ -z "${DATABASE_NAME}" ] || ! [[ ${DATABASE_NAME} =~ $DATABASE_NAME ]]
+do
+    echo -n "[Apache Tomcat Server] Enter database name: ";
+    read -r DATABASE_NAME;
+done
+"${JAVA_HOME}"/bin/java -jar replace-1.0.jar -o "jdbc:mysql://localhost:3308/scadalts" -n "jdbc:mysql://${DATABASE_HOSTNAME}:${DATABASE_PORT}/${DATABASE_NAME}" -f "${CATALINA_CONTEXT_XML}";
 
 while [ -z "${DATABASE_USERNAME}" ] || ! [[ ${DATABASE_USERNAME} =~ ${USERNAME_REGEX} ]]
 do