From 029ec6b21677675d60ac9043d14e7d076119423d Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 14 Mar 2024 13:59:55 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ncac/setup.ini |  2 +-
 ncac/setup.sh  | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ncac/setup.ini b/ncac/setup.ini
index d746308..3ba60e9 100644
--- a/ncac/setup.ini
+++ b/ncac/setup.ini
@@ -17,4 +17,4 @@ NGINX_INS=1
 ### 是否安装自带的Redis ###
 REDIS_INS=0
 ### Redis的密码 ###
-REDIS_PASS=123456
\ No newline at end of file
+REDIS_PASS=
diff --git a/ncac/setup.sh b/ncac/setup.sh
index a269ec2..5308974 100644
--- a/ncac/setup.sh
+++ b/ncac/setup.sh
@@ -127,8 +127,10 @@ installNewCAC(){
     chmod +x ${BIN_DIR}/startCac.sh
     chmod +x ${BIN_DIR}/stopCac.sh
     echo ""
-    echo 'export PATH=$PATH:'${BIN_DIR} >> /etc/profile
-    source /etc/profile
+    if [ `grep -c ${BIN_DIR} /etc/profile` -eq '0' ]; then
+        echo 'export PATH=$PATH:'${BIN_DIR} >> /etc/profile
+        source /etc/profile
+    fi
     sleep 1
 }
 
@@ -146,17 +148,17 @@ setAutoStartRedis(){
     if [ `grep -c ${BIN_DIR}/startRedis.sh /etc/rc.d/rc.local` -eq '0' ]; then
       echo '#Redis' >> /etc/rc.d/rc.local
       echo ${BIN_DIR}/startRedis.sh >> /etc/rc.d/rc.local
+      echo "Redis已加入开机启动."
+      echo ""
     fi
-    echo "Redis已加入开机启动."
-    echo ""
 }
 setAutoStartNginx(){
     if [ `grep -c ${BIN_DIR}/startNginx.sh /etc/rc.d/rc.local` -eq '0' ]; then
       echo '#Nginx' >> /etc/rc.d/rc.local
       echo ${BIN_DIR}/startNginx.sh >> /etc/rc.d/rc.local
+      echo "Nginx已加入开机启动."
+      echo ""
     fi
-    echo "Nginx已加入开机启动."
-    echo ""
 }
 
 
@@ -179,6 +181,7 @@ if [ $JDK_INS == 1 ]; then
     installJDK
 else
   echo ${JAVA_PATH}" found, 跳过JDK."
+  echo ""
 fi
 
 if [ $REDIS_INS == 1 ]; then
@@ -198,4 +201,9 @@ if [ $NGINX_INS == 1 ]; then
 fi
 
 echo "************[install finished.]安装完成. >>>>>>>>>>>>>"
+echo ""
 sleep 1
+echo "tips: 记得运行 source /etc/profile"
+echo "      使配置生效，之后可以使用${BIN_DIR}目录下的下列脚本"
+ls ${BIN_DIR}
+echo ""
\ No newline at end of file