From ac08411718672104c1aa54ba5b7fa7d46e98746d Mon Sep 17 00:00:00 2001
From: lizw <1183409807@qq.com>
Date: Sun, 30 Oct 2022 16:29:00 +0800
Subject: [PATCH] 07env-install-centos.sh

---
 00base/07env-install-centos.sh | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/00base/07env-install-centos.sh b/00base/07env-install-centos.sh
index ae7b695..728085b 100644
--- a/00base/07env-install-centos.sh
+++ b/00base/07env-install-centos.sh
@@ -66,7 +66,7 @@ COMMAND_OUTPUT=""
 function trap::info() {
   [[ ${#ERROR_INFO} -gt 37 ]] && echo -e "$ERROR_INFO"
   [[ ${#ACCESS_INFO} -gt 38 ]] && echo -e "$ACCESS_INFO"
-  [ -f "$LOG_FILE" ] && echo -e "\n\n  See detailed log >>> $LOG_FILE \n\n"
+  [ -f "$LOG_FILE" ] && echo -e "\n\n  See detailed log >>> cat $LOG_FILE \n\n"
   trap '' EXIT
   exit
 }
@@ -229,17 +229,22 @@ function init:add_user() {
   log::info "[add-user]" "新增用户[${ADD_USER_NAME}]..."
   local host="127.0.0.1"
   command::exec "${host}" "
-    # 创建用户
-    adduser ${ADD_USER_NAME}
-    # 设置密码
-    echo ${ADD_USER_NAME}:${ADD_USER_PASSWORD} | chpasswd
-    # 新增修改权限
-    chmod -v u+w /etc/sudoers
-    echo -e \"\n${ADD_USER_NAME}    ALL=(ALL)       NOPASSWD:ALL\n\" >> /etc/sudoers
-    # 收回修改权限
-    chmod -v u-w /etc/sudoers
+      # 创建用户
+      adduser ${ADD_USER_NAME}
   "
-  check::exit_code "$?" "add-user" "$host 新增用户[${ADD_USER_NAME}]" "exit"
+  local code="$?"
+  if [[ "${code}" == "0" ]]; then
+    command::exec "${host}" "
+      # 设置密码
+      echo ${ADD_USER_NAME}:${ADD_USER_PASSWORD} | chpasswd
+      # 新增修改权限
+      chmod -v u+w /etc/sudoers
+      echo -e \"\n${ADD_USER_NAME}    ALL=(ALL)       NOPASSWD:ALL\n\" >> /etc/sudoers
+      # 收回修改权限
+      chmod -v u-w /etc/sudoers
+    "
+    check::exit_code "$?" "add-user" "$host 新增用户[${ADD_USER_NAME}]" "exit"
+  fi
   log::info "[add-user]" "新增用户[${ADD_USER_NAME}]成功!"
 }