github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): 完善内容

pull/534/merge
mack-a 2020-09-02 10:40:16 +08:00
parent 59b950c9d2
commit 1af2b398b8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install.sh
View File

@ -211,9 +211,8 @@ installTools(){
# mkdirTools # mkdirTools
progressTools "yellow" "检查、安装acme--->" 14 progressTools "yellow" "检查、安装acme--->" 14
mkdir -p /etc/tls/
curl -s https://get.acme.sh | sh > /etc/tls/acme.log curl -s https://get.acme.sh | sh > /etc/tls/acme.log
if [[ ! -d "~/.acme.sh" ]] if [[ -d "~/.acme.sh" ]] && [[ -z `ls -F ~/.acme.sh/|grep -w "acme.sh"` ]]
then then
echoContent red " acme安装失败--->" echoContent red " acme安装失败--->"
echoContent yellow "错误排查：" echoContent yellow "错误排查："
@ -993,7 +992,7 @@ defaultBase64Code(){
echoContent green ' {"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"aid":"0","v":"2","host":"'${host}'","type":"none","path":'${path}',"net":"h2","add":"'${add}'","allowInsecure":0,"method":"none","peer":""}\n' echoContent green ' {"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"aid":"0","v":"2","host":"'${host}'","type":"none","path":'${path}',"net":"h2","add":"'${add}'","allowInsecure":0,"method":"none","peer":""}\n'
elif [[ "${globalType}" = "vlesstcpws" ]] elif [[ "${globalType}" = "vlesstcpws" ]]
then then
echoContent red path:${path} echoContent red path:${path} "no"
qrCodeBase64Default=`echo -n '{"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"aid":"0","v":"2","host":"'${host}'","type":"none","path":'${path}',"net":"ws","add":"'${add}'","allowInsecure":0,"method":"none","peer":"'${host}'"}'|sed 's#/#\\\/#g'|base64` qrCodeBase64Default=`echo -n '{"port":"443","ps":"'${ps}'","tls":"tls","id":'"${id}"',"aid":"0","v":"2","host":"'${host}'","type":"none","path":'${path}',"net":"ws","add":"'${add}'","allowInsecure":0,"method":"none","peer":"'${host}'"}'|sed 's#/#\\\/#g'|base64`
qrCodeBase64Default=`echo ${qrCodeBase64Default}|sed 's/ //g'` qrCodeBase64Default=`echo ${qrCodeBase64Default}|sed 's/ //g'`
echoContent red "通用json(ws+tls)--->" "no" echoContent red "通用json(ws+tls)--->" "no"
@ -1171,7 +1170,7 @@ installV2RayVmessTCPTLS(){
installV2RayVLESSTCPWSTLS(){ installV2RayVLESSTCPWSTLS(){
mkdirTools mkdirTools
globalType=vlesstcpws globalType=vlesstcpws
# installTools installTools
# 申请tls # 申请tls
initTLSNginxConfig initTLSNginxConfig
installTLS installTLS