github
/
Xray_onekey
mirror of https://github.com/wulabing/Xray_onekey
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xray-0.0.9 (#319) 

[bugfix] 证书相关内容
pull/321/head
玖柒Max 2021-02-16 01:20:35 +08:00 committed by GitHub
parent 730541e76f
commit 55f45b4c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install.sh
View File

@ -23,7 +23,7 @@ OK="${Green}[OK]${Font}"
ERROR="${Red}[ERROR]${Font}" ERROR="${Red}[ERROR]${Font}"
# 变量 # 变量
shell_version="0.0.8" shell_version="0.0.9"
github_branch="xray" github_branch="xray"
version_cmp="/tmp/version_cmp.tmp" version_cmp="/tmp/version_cmp.tmp"
xray_conf_dir="/usr/local/etc/xray" xray_conf_dir="/usr/local/etc/xray"
@ -325,6 +325,7 @@ function acme() {
function ssl_judge_and_install() { function ssl_judge_and_install() {
mkdir -p /ssl
if [[ -f "/ssl/xray.key" || -f "/ssl/xray.crt" ]]; then if [[ -f "/ssl/xray.key" || -f "/ssl/xray.crt" ]]; then
echo "/ssl 目录下证书文件已存在" echo "/ssl 目录下证书文件已存在"
echo -e "${OK} ${GreenBG} 是否删除 [Y/N]? ${Font}" echo -e "${OK} ${GreenBG} 是否删除 [Y/N]? ${Font}"
@ -343,7 +344,7 @@ function ssl_judge_and_install() {
echo "证书文件已存在" echo "证书文件已存在"
elif [[ -f "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" ]]; then elif [[ -f "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" ]]; then
echo "证书文件已存在" echo "证书文件已存在"
"$HOME"/.acme.sh/acme.sh --installcert -d "${domain}" --fullchainpath /ssl/xray.key --keypath /ssl/xray.crt --ecc "$HOME"/.acme.sh/acme.sh --installcert -d "${domain}" --fullchainpath /ssl/xray.crt --keypath /ssl/xray.key --ecc
judge "证书应用" judge "证书应用"
else else
mkdir /ssl mkdir /ssl