From 4cd7a9c19f3d9e58d6cd4c0c70df4ba162e5d158 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 24 Oct 2024 14:48:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4centos7=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncac/{ => centos7}/setup.sh | 13 +++++++------
 ncac/package/rc.local       |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename ncac/{ => centos7}/setup.sh (97%)
 create mode 100644 ncac/package/rc.local

diff --git a/ncac/setup.sh b/ncac/centos7/setup.sh
similarity index 97%
rename from ncac/setup.sh
rename to ncac/centos7/setup.sh
index 24964c7..f399ddc 100644
--- a/ncac/setup.sh
+++ b/ncac/centos7/setup.sh
@@ -4,10 +4,6 @@ sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
 sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
 sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 sed -i 's#SELINUX=enforcing#SELINUX=disabled#' /etc/selinux/config
-rpm -i package/mysql57-community-release-el7-9.noarch.rpm
-rm -f /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
-rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
-chmod +x prelib.sh
 
 
 #################### init system env ################################################
@@ -20,8 +16,11 @@ if [ X"${SYSBIT}" != X"64" ]; then
 fi
 ARM=`arch`
 
-
+#################### 安装数据库 ################################################
 installDatabase(){
+    rpm -i package/mysql57-community-release-el7-9.noarch.rpm
+    rm -f /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
+    rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
     DB_DIR=${BASE_DIR}/db
     mkdir -p ${DB_DIR}
     echo "************ 删除旧数据库 >>>>>>>>>>>>>"
@@ -321,7 +320,9 @@ CAC_DIR=${BASE_DIR}/ncac
 mkdir -p ${BIN_DIR}
 mkdir -p ${CAC_DIR}
 mkdir -p ${BASE_DIR}/conf
-touch /etc/rc.d/rc.local
+if [ ! -e "/etc/rc.d/rc.local" ]; then
+    cp package/rc.local /etc/rc.d/
+fi
 chmod +x /etc/rc.d/rc.local
 
 if [ $MYSQL_INS == 1 ]; then
diff --git a/ncac/package/rc.local b/ncac/package/rc.local
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/ncac/package/rc.local
@@ -0,0 +1 @@
+#!/bin/bash