From 96c0900a1d0b2cb44ba4b53a095efb3c60dabd8e Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Tue, 1 Nov 2022 15:24:40 +0800
Subject: [PATCH] 08jenkins-agent-install-centos.sh

---
 00base/07env-install-centos.sh           | 17 +++++++++++++----
 00base/08jenkins-agent-install-centos.sh |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/00base/07env-install-centos.sh b/00base/07env-install-centos.sh
index ccd8aa8..a91e0bd 100644
--- a/00base/07env-install-centos.sh
+++ b/00base/07env-install-centos.sh
@@ -506,9 +506,18 @@ function init:jenkins() {
 #!/bin/bash
 
 httpPort=\\\${1:-'30003'}
-pid=\\\`ps -ef | grep 'DappName=jenkins' | grep -v 'grep' | awk '{print \\\$2}'\\\`
+
+#-------------------------------------------------------------------
+java='$java_path/bin/java'
+jar_file='${BASE_DIR}/jenkins/jenkins.war'
+java_mem_opts=' -DappName=jenkins $java_opts_ext'
+database_opts='$database_opts'
+java_opts_ext='$java_opts_ext'
+#-------------------------------------------------------------------
+
+pid=\\\`ps -ef | grep 'DappName=jenkins ' | grep -v 'grep' | awk '{print \\\$2}'\\\`
 if [ -z \\\$pid ];then
-  nohup $java_path/bin/java $java_mem_opts $database_opts $java_opts_ext -jar ${BASE_DIR}/jenkins/jenkins.war --httpPort=\\\$httpPort >${BASE_DIR}/jenkins/logs.log 2>&1 &
+  nohup \\\$java \\\$java_mem_opts \\\$database_opts \\\$java_opts_ext -jar \\\$jar_file --httpPort=\\\$httpPort >${BASE_DIR}/jenkins/logs.log 2>&1 &
   echo 'jenkins启动成功!'
 else
   echo 'jenkins正在运行...'
@@ -519,11 +528,11 @@ EOF
     cat << EOF > ${BASE_DIR}/jenkins/kill.sh
 #!/bin/bash
 
-pid=\\\`ps -ef | grep 'DappName=jenkins' | grep -v 'grep' | awk '{print \\\$2}'\\\`
+pid=\\\`ps -ef | grep 'DappName=jenkins ' | grep -v 'grep' | awk '{print \\\$2}'\\\`
 if [ -z \\\$pid ];then
   echo 'jenkins未运行'
 else
-  ps -ef | grep 'DappName=jenkins' | grep -v 'grep' | awk '{print \\\$2}' | xargs kill
+  ps -ef | grep 'DappName=jenkins ' | grep -v 'grep' | awk '{print \\\$2}' | xargs kill
   echo 'jenkins已停止!'
 fi
 EOF
diff --git a/00base/08jenkins-agent-install-centos.sh b/00base/08jenkins-agent-install-centos.sh
index 2290764..6e4d075 100644
--- a/00base/08jenkins-agent-install-centos.sh
+++ b/00base/08jenkins-agent-install-centos.sh
@@ -252,7 +252,7 @@ database_opts='$database_opts'
 java_opts_ext='$java_opts_ext'
 #-------------------------------------------------------------------
 
-pid=\\\`ps -ef | grep 'DappName=jenkins-agent' | grep -v 'grep' | awk '{print \\\$2}'\\\`
+pid=\\\`ps -ef | grep 'DappName=jenkins-agent ' | grep -v 'grep' | awk '{print \\\$2}'\\\`
 if [ -z \\\$pid ];then
   nohup \\\$java \\\$java_mem_opts \\\$database_opts \\\$java_opts_ext -jar \\\$agent_file -jnlpUrl \\\$jnlpUrl -secret \\\$secret -workDir \\\$workDir >${BASE_DIR}/agent-logs.log 2>&1 &
   echo 'jenkins-agent启动成功!'
@@ -265,11 +265,11 @@ EOF
       cat << EOF > ${BASE_DIR}/kill.sh
 #!/bin/bash
 
-pid=\\\`ps -ef | grep 'DappName=jenkins-agent' | grep -v 'grep' | awk '{print \\\$2}'\\\`
+pid=\\\`ps -ef | grep 'DappName=jenkins-agent ' | grep -v 'grep' | awk '{print \\\$2}'\\\`
 if [ -z \\\$pid ];then
   echo 'jenkins-agent未运行'
 else
-  ps -ef | grep 'DappName=jenkins-agent' | grep -v 'grep' | awk '{print \\\$2}' | xargs kill
+  ps -ef | grep 'DappName=jenkins-agent ' | grep -v 'grep' | awk '{print \\\$2}' | xargs kill
   echo 'jenkins-agent已停止!'
 fi
 EOF