diff --git a/00base/07env-install-centos.sh b/00base/07env-install-centos.sh index ff1c77d..0417fb8 100644 --- a/00base/07env-install-centos.sh +++ b/00base/07env-install-centos.sh @@ -369,18 +369,25 @@ function init:java() { local line="\n" local add_profile=`echo -e "${line}JAVA_HOME=${java_path}${line}PATH=\$JAVA_HOME/bin:\$PATH${line}export JAVA_HOME PATH"` command::exec "${host}" " + yum -y remove *openjdk* if [ ! -d "$java_path" ]; then mkdir -p ${BASE_DIR}/java wget --timeout=10 --waitretry=3 --tries=5 --retry-connrefused --no-check-certificate ${JDK_URL} -O ${BASE_DIR}/java/${JDK_FILE_NAME} cd ${BASE_DIR}/java tar -zxvf ${JDK_FILE_NAME} - echo -e '$add_profile' >> /etc/profile - sudo source /etc/profile - sudo chown -R \$(id -u):\$(id -g) ${BASE_DIR}/java + fi + if [ \`grep -c '$add_profile' '/etc/sudoers'\` == '0' ];then + echo '$add_profile' >> /etc/profile + source /etc/profile fi java -version " check::exit_code "$?" "java" "$host 安装java环境" "exit" + if [[ "${ADD_USER_TAG:-}" == "1" ]]; then + command::exec "${host}" " + sudo chown -R \$(id -u ${ADD_USER_NAME}):\$(id -g ${ADD_USER_NAME}) ${BASE_DIR}/java + " + fi log::info "[java]" "java环境安装成功!" }