Skip to content

Commit 70df24e

Browse files
committed
refactory the check_container
1 parent baceffa commit 70df24e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scripts/install.ubuntu.18.04.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ install_docker() {
6565
fi
6666
}
6767

68+
6869
check_container(){
6970
has_container=$(sudo docker ps --format "{{.Names}}" | grep "$1")
7071

72+
# test 命令规范: 0 为 true, 1 为 false, >1 为 error
7173
if [ -n "$has_container" ] ;then
72-
return 1
73-
else
7474
return 0
75+
else
76+
return 1
7577
fi
7678
}
7779

@@ -110,7 +112,7 @@ install_gost() {
110112
return
111113
fi
112114

113-
if [ 1 = "$(check_container gost)" ]; then
115+
if check_container gost ; then
114116
echo -e "${COLOR_ERROR}Gost 容器已经在运行了,你可以手动停止容器,并删除容器,然后再执行本命令来重新安装 Gost。 ${COLOR_NONE}"
115117
return
116118
fi
@@ -164,7 +166,7 @@ install_shadowsocks(){
164166
return
165167
fi
166168

167-
if [ 1 = "$(check_container ss)" ]; then
169+
if [ check_container ss ; then
168170
echo -e "${COLOR_ERROR}ShadowSocks 容器已经在运行了,你可以手动停止容器,并删除容器,然后再执行本命令来重新安装 ShadowSocks。${COLOR_NONE}"
169171
return
170172
fi
@@ -191,7 +193,7 @@ install_vpn(){
191193
return
192194
fi
193195

194-
if [ 1 = "$(check_container vpn)" ]; then
196+
if check_container vpn ; then
195197
echo -e "${COLOR_ERROR}VPN 容器已经在运行了,你可以手动停止容器,并删除容器,然后再执行本命令来重新安装 VPN。${COLOR_NONE}"
196198
return
197199
fi

0 commit comments

Comments
 (0)