From 10a78656dfac5457698a2c18ddfabcbbd93f415e Mon Sep 17 00:00:00 2001
From: ZhuoQinghui <1302344380@qq.com>
Date: Fri, 1 Mar 2024 16:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20centos-7-init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CentOS/7/all/centos-7-init | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/CentOS/7/all/centos-7-init b/CentOS/7/all/centos-7-init
index b52974e..a01219e 100644
--- a/CentOS/7/all/centos-7-init
+++ b/CentOS/7/all/centos-7-init
@@ -132,7 +132,7 @@ fi
 
 # 如果用户输入了管理员账户且账户不存在，则创建管理员账号
 if [[ -n "$admin_user" && ! $(id -u "$admin_user" 2>/dev/null) ]]; then
-    admin_password="Zqh$(echo "$admin_user" | awk '{print toupper(substr($0, 1, 1))}')@$(hostname)"
+    admin_password="Zqh${admin_user^}@$(hostname)"
     useradd "$admin_user"
     echo "$admin_password" | passwd --stdin "$admin_user"
     echo "创建管理员账号成功：账号为$admin_user，密码为$admin_password"
@@ -140,7 +140,7 @@ fi
 
 # 如果用户输入了普通账户且账户不存在，则创建普通账号
 if [[ -n "$user" && ! $(id -u "$user" 2>/dev/null) ]]; then
-    user_password="Zqh$(echo "$user" | awk '{print toupper(substr($0, 1, 1))}')@$(hostname)"
+    user_password="Zqh${$user^}@$(hostname)"
     useradd "$user"
     echo "$user_password" | passwd --stdin "$user"
     echo "创建普通账号成功：账号为$user，密码为$user_password"
@@ -193,6 +193,19 @@ if [[ "$install_docker" == "y" ]]; then
     systemctl start docker
     systemctl enable docker
     echo "Docker安装完成"
+
+    # 如果管理员账户被创建，将其添加到docker组
+    if [[ -n "$admin_user" && $(id -u "$admin_user" 2>/dev/null) ]]; then
+        usermod -aG docker "$admin_user"
+        echo "管理员账户$admin_user已添加到docker组"
+    fi
+
+    # 如果普通用户账户被创建，将其添加到docker组
+    if [[ -n "$user" && $(id -u "$user" 2>/dev/null) ]]; then
+        usermod -aG docker "$user"
+        echo "普通账户$user已添加到docker组"
+    fi
+
 fi
 
 # 如果用户要为docker配置阿里云镜像加速，则执行配置阿里云镜像加速命令
@@ -233,8 +246,10 @@ fi
 # 如果用户要安装docker-compose，则先判断当前路径下是否有docker-compose二进制文件，如果没有则通过curl下载，然后执行安装
 if [[ "$install_docker_compose" == "y" ]]; then
     if [[ ! -x "$(command -v docker-compose)" ]]; then
-        echo "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)"
-        curl -L -o docker-compose https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)
+        if [[ ! -f "./docker-compose" ]]; then
+            # "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)"
+            curl -u zqh:OpenFile -o docker-compose http://file.zzzykj.cn/soft/docker-compose
+        fi
         chmod +x docker-compose
         mv docker-compose /usr/local/bin/
         docker-compose version