diff --git a/00base/07env-install-centos.sh b/00base/07env-install-centos.sh index efc41c2..0da70ee 100644 --- a/00base/07env-install-centos.sh +++ b/00base/07env-install-centos.sh @@ -484,10 +484,10 @@ function init:jenkins() { cat << EOF > ${BASE_DIR}/jenkins/start.sh #!/bin/bash -httpPort=\${1:-'30003'} -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 jenkins.war --httpPort=\$httpPort >${BASE_DIR}/jenkins/logs.log 2>&1 & +httpPort=\\\${1:-'30003'} +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 jenkins.war --httpPort=\\\$httpPort >${BASE_DIR}/jenkins/logs.log 2>&1 & echo 'jenkins启动成功!' else echo 'jenkins正在运行...' @@ -498,14 +498,16 @@ EOF cat << EOF > ${BASE_DIR}/jenkins/kill.sh #!/bin/bash -pid=\`ps -ef | grep 'DappName=jenkins' | grep -v 'grep' | awk '{print \$2}'\` -if [ -z \$pid ];then +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 + chmod +x ${BASE_DIR}/jenkins/start.sh + chmod +x ${BASE_DIR}/jenkins/kill.sh " check::exit_code "$?" "jenkins" "$host 安装jenkins环境" "exit" if [[ "${ADD_USER_TAG:-}" == "1" ]]; then