优化了软件用户创建逻辑

- 将用户创建逻辑由 install 转移到了 init
ztj1993 · Nov 6, 2018 · e1f29e6 · e1f29e6
1 parent 3596670
commit e1f29e6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/Plugin/frp/install.sh b/Plugin/frp/install.sh
@@ -20,5 +20,3 @@ UnPackage_tar
 ### 验证软件安装
 CheckInstalld_file frps
 CheckInstalld_file frpc
-### 配置软件
-ConfigSoftware_install
diff --git a/Plugin/gogs/install.sh b/Plugin/gogs/install.sh
@@ -18,5 +18,3 @@ DowmPackage_wget
 UnPackage_tar
 ### 验证软件安装
 CheckInstalld_file gogs
-### 配置软件
-ConfigSoftware_install
diff --git a/Plugin/mindoc/install.sh b/Plugin/mindoc/install.sh
@@ -18,5 +18,3 @@ DowmPackage_wget
 UnPackage_zip
 ### 验证软件安装
 CheckInstalld_file mindoc_linux_amd64
-### 配置软件
-ConfigSoftware_install
diff --git a/Shell/Plugin/Init.sh b/Shell/Plugin/Init.sh
@@ -31,6 +31,10 @@ function MakeSoftwareConfigFile_init() {
 
 ### 默认初始化软件流程
 function InitSoftware_default(){
+    # 创建用户
+    sudo groupadd -f ${SoftwareGroup}
+    id -u ${SoftwareUser} > /dev/null 2>&1
+    [ $? -ne 0 ] && sudo useradd -m -g ${SoftwareGroup} ${SoftwareUser}
     # 创建配置文件目录
     sudo mkdir -p $(dirname ${SoftwareConfigFile})
     # 创建数据目录

diff --git a/Shell/Plugin/Install.sh b/Shell/Plugin/Install.sh
@@ -62,15 +62,3 @@ function CheckInstalld_file() {
         exit 1
     fi
 }
-
-### 配置配置
-function ConfigSoftware_install(){
-    # 用户组及用户
-    sudo groupadd -f ${SoftwareGroup}
-    id -u ${SoftwareUser} > /dev/null 2>&1
-    [ $? -ne 0 ] && sudo useradd -m -g ${SoftwareGroup} ${SoftwareUser}
-    # 用户目录权限
-    sudo chown ${SoftwareUser}.${SoftwareGroup} /home/${SoftwareUser}
-    # 软件安装目录权限
-    sudo chown -R ${SoftwareUser}.${SoftwareGroup} ${SoftwarePathInstall}
-}