mack-a
/
v2ray-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(脚本): 修改安装bug

pull/534/merge
mack-a 2020-09-04 10:35:14 +08:00
parent 8ab0657d1c
commit f9221caf0c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install.sh
View File

@ -236,11 +236,11 @@ installTools(){
# 新建所需目录 # 新建所需目录
# mkdirTools # mkdirTools
if [[ -d "~/.acme.sh" ]] || [[ -z `ls -F ~/.acme.sh/|grep -w "acme.sh"` ]] if [[ ! -d "/root/.acme.sh" ]]
then then
# progressTools "yellow" "安装acme.sh--->" # progressTools "yellow" "安装acme.sh--->"
echoContent green " ---> 安装acme.sh" echoContent green " ---> 安装acme.sh"
curl -s https://get.acme.sh | sh > /etc/tls/acme.log curl -s https://get.acme.sh | sh > /etc/v2ray-agent/tls/acme.log
if [[ -d "~/.acme.sh" ]] && [[ -z `ls -F ~/.acme.sh/|grep -w "acme.sh"` ]] if [[ -d "~/.acme.sh" ]] && [[ -z `ls -F ~/.acme.sh/|grep -w "acme.sh"` ]]
then then
echoContent red " acme安装失败--->" echoContent red " acme安装失败--->"
@ -252,6 +252,21 @@ installTools(){
exit 0 exit 0
fi fi
fi fi
if [[ -d "/root/.acme.sh" ]] && [[ -z `find /root/.acme.sh/ -name "acme.sh"` ]]
then
echoContent green " ---> 安装acme.sh"
curl -s https://get.acme.sh | sh > /etc/v2ray-agent/tls/acme.log
if [[ -d "~/.acme.sh" ]] && [[ -z `find /root/.acme.sh/ -name "acme.sh"` ]]
then
echoContent red " acme安装失败--->"
echoContent yellow "错误排查："
echoContent red " 1.获取Github文件失败，请等待GitHub恢复后尝试，恢复进度可查看 [https://www.githubstatus.com/]"
echoContent red " 2.acme.sh脚本出现bug，可查看[https://github.com/acmesh-official/acme.sh] issues"
echoContent red " 3.反馈给开发者[私聊：https://t.me/mack_a] 或 [提issues]"
killSleep > /dev/null 2>&1
exit 0
fi
fi
} }
# 初始化Nginx申请证书配置 # 初始化Nginx申请证书配置
initTLSNginxConfig(){ initTLSNginxConfig(){
@ -1109,7 +1124,7 @@ defaultBase64Code(){
echoContent yellow " ---> 通用json(VLESS+tcp+tls)" echoContent yellow " ---> 通用json(VLESS+tcp+tls)"
echoContent green ' {"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"host":"'${host}'","type":"none","net":"tcp","add":"'${host}'","allowInsecure":0,"method":"none","peer":""}\n' echoContent green ' {"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"host":"'${host}'","type":"none","net":"tcp","add":"'${host}'","allowInsecure":0,"method":"none","peer":""}\n'
echoContent green ' V2Ray v4.27.4 目前无通用订阅需要手动配置，VLESS和tcp大部分一样，其余内容不变' echoContent green ' V2Ray v4.27.4 目前无通用订阅，需要手动配置，VLESS和tcp大部分一样，其余内容不变'
fi fi
# echoContent green ' V2Ray v4.27.0 目前无通用订阅需要手动配置，VLESS和上面大部分一样，path则是"'/${2}vld'"，其余内容不变' # echoContent green ' V2Ray v4.27.0 目前无通用订阅需要手动配置，VLESS和上面大部分一样，path则是"'/${2}vld'"，其余内容不变'