Skip to content

Commit e1f29e6

Browse files
committed
优化了 软件用户创建逻辑
- 将 用户创建逻辑 由 install 转移到了 init
1 parent 3596670 commit e1f29e6

5 files changed

Lines changed: 4 additions & 18 deletions

File tree

Plugin/frp/install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,3 @@ UnPackage_tar
2020
### 验证软件安装
2121
CheckInstalld_file frps
2222
CheckInstalld_file frpc
23-
### 配置软件
24-
ConfigSoftware_install

Plugin/gogs/install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ DowmPackage_wget
1818
UnPackage_tar
1919
### 验证软件安装
2020
CheckInstalld_file gogs
21-
### 配置软件
22-
ConfigSoftware_install

Plugin/mindoc/install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ DowmPackage_wget
1818
UnPackage_zip
1919
### 验证软件安装
2020
CheckInstalld_file mindoc_linux_amd64
21-
### 配置软件
22-
ConfigSoftware_install

Shell/Plugin/Init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ function MakeSoftwareConfigFile_init() {
3131

3232
### 默认初始化软件流程
3333
function InitSoftware_default(){
34+
# 创建用户
35+
sudo groupadd -f ${SoftwareGroup}
36+
id -u ${SoftwareUser} > /dev/null 2>&1
37+
[ $? -ne 0 ] && sudo useradd -m -g ${SoftwareGroup} ${SoftwareUser}
3438
# 创建配置文件目录
3539
sudo mkdir -p $(dirname ${SoftwareConfigFile})
3640
# 创建数据目录

Shell/Plugin/Install.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,3 @@ function CheckInstalld_file() {
6262
exit 1
6363
fi
6464
}
65-
66-
### 配置配置
67-
function ConfigSoftware_install(){
68-
# 用户组及用户
69-
sudo groupadd -f ${SoftwareGroup}
70-
id -u ${SoftwareUser} > /dev/null 2>&1
71-
[ $? -ne 0 ] && sudo useradd -m -g ${SoftwareGroup} ${SoftwareUser}
72-
# 用户目录权限
73-
sudo chown ${SoftwareUser}.${SoftwareGroup} /home/${SoftwareUser}
74-
# 软件安装目录权限
75-
sudo chown -R ${SoftwareUser}.${SoftwareGroup} ${SoftwarePathInstall}
76-
}

0 commit comments

Comments
 (0)