From 0cb7532059bc65162ca4940c585e89ccc1cc4363 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 9 Jan 2025 10:50:13 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E8=B0=83=E6=95=B4Ubuntu=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85GUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncac/setup.ini         |  2 +-
 ncac/ubuntu22/setup.sh | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ncac/setup.ini b/ncac/setup.ini
index 78d4d8d..6e46a2c 100644
--- a/ncac/setup.ini
+++ b/ncac/setup.ini
@@ -20,7 +20,7 @@ CAC_INS=1
 AUTO_START=1
 
 ### 是否安装61850 ###
-GUI_INS=1
+GUI_INS=0
 
 ### 是否安装自带的JDK ###
 JDK_INS=1
diff --git a/ncac/ubuntu22/setup.sh b/ncac/ubuntu22/setup.sh
index 535f4ed..4db5303 100644
--- a/ncac/ubuntu22/setup.sh
+++ b/ncac/ubuntu22/setup.sh
@@ -33,7 +33,6 @@ installDatabase(){
     systemctl stop mysql
     sleep 1
     sed -i 's/123456/'${DB_PASS}'/' package/init.sql
-    sed -i 's/cacdb/'${DB_INS}'/g' package/cacdb.sql
 
     echo "  初始化数据库 ..."
     echo ""
@@ -47,11 +46,20 @@ installDatabase(){
     sleep 1
     export MYSQL_PWD=${DB_PASS}
     mysql -u root < package/init.sql
-    mysql -u root < package/cacdb.sql
     sleep 1
     echo "  重启数据库 ..."
     echo ""
     systemctl restart mysql
+    sleep 1
+}
+
+createDatabase(){
+    echo "  建库建表 ..."
+    echo ""
+    sed -i 's/cacdb/'${DB_INS}'/g' package/cacdb.sql
+    export MYSQL_PWD=${DB_PASS}
+    mysql -u root < package/cacdb.sql
+    sleep 1
 }
 
 #################### 安装OpenJDK ################################################
@@ -330,6 +338,9 @@ fi
 if [ $MYSQL_INS == 1 ]; then
     installDatabase
 fi
+if [ $DB_CREATE == 1 ]; then
+    createDatabase
+fi
 
 if [ $JDK_INS == 1 ]; then
     installJDK