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

1.0.7.1 完善证书存在判断逻辑，替换~为$HOME

pull/171/head
wulabing 2020-02-07 16:40:24 +08:00
parent dcee59f2a7
commit 7414b3bfc9
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
install.sh
View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
export PATH
cd $(cd "$(dirname "$0")"; pwd) cd $(cd "$(dirname "$0")"; pwd)
#==================================================== #====================================================
@ -24,7 +26,7 @@ OK="${Green}[OK]${Font}"
Error="${Red}[错误]${Font}" Error="${Red}[错误]${Font}"
# 版本 # 版本
shell_version="1.0.7" shell_version="1.0.7.1"
shell_mode="None" shell_mode="None"
version_cmp="/tmp/version_cmp.tmp" version_cmp="/tmp/version_cmp.tmp"
v2ray_conf_dir="/etc/v2ray" v2ray_conf_dir="/etc/v2ray"
@ -409,29 +411,29 @@ port_exist_check(){
fi fi
} }
acme(){ acme(){
~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force --test $HOME/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force --test
if [[ $? -eq 0 ]];then if [[ $? -eq 0 ]];then
echo -e "${OK} ${GreenBG} SSL 证书测试签发成功，开始正式签发 ${Font}" echo -e "${OK} ${GreenBG} SSL 证书测试签发成功，开始正式签发 ${Font}"
sleep 2 sleep 2
else else
echo -e "${Error} ${RedBG} SSL 证书测试签发失败 ${Font}" echo -e "${Error} ${RedBG} SSL 证书测试签发失败 ${Font}"
rm -rf "~/.acme.sh/${domain}_ecc/${domain}.key" && rm -rf "~/.acme.sh/${domain}_ecc/${domain}.cer" rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.cer"
exit 1 exit 1
fi fi
~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force $HOME/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force
if [[ $? -eq 0 ]];then if [[ $? -eq 0 ]];then
echo -e "${OK} ${GreenBG} SSL 证书生成成功 ${Font}" echo -e "${OK} ${GreenBG} SSL 证书生成成功 ${Font}"
sleep 2 sleep 2
mkdir /data mkdir /data
~/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /data/v2ray.crt --keypath /data/v2ray.key --ecc $HOME/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /data/v2ray.crt --keypath /data/v2ray.key --ecc
if [[ $? -eq 0 ]];then if [[ $? -eq 0 ]];then
echo -e "${OK} ${GreenBG} 证书配置成功 ${Font}" echo -e "${OK} ${GreenBG} 证书配置成功 ${Font}"
sleep 2 sleep 2
fi fi
else else
echo -e "${Error} ${RedBG} SSL 证书生成失败 ${Font}" echo -e "${Error} ${RedBG} SSL 证书生成失败 ${Font}"
rm -rf "~/.acme.sh/${domain}_ecc/${domain}.key" && rm -rf "~/.acme.sh/${domain}_ecc/${domain}.cer" rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.cer"
exit 1 exit 1
fi fi
} }
@ -610,11 +612,25 @@ show_information(){
cat ${v2ray_info_file} cat ${v2ray_info_file}
} }
ssl_judge_and_install(){ ssl_judge_and_install(){
# if [[ -f "/data/v2ray.key" && -f "/data/v2ray.crt" ]];then if [[ -f "/data/v2ray.key" || -f "/data/v2ray.crt" ]];then
# echo "证书文件已存在" echo "/data 目录下证书文件已存在"
if [[ -f "~/.acme.sh/${domain}_ecc/${domain}.key" && -f "~/.acme.sh/${domain}_ecc/${domain}.cer" ]];then echo -e "${OK} ${GreenBG} 是否删除 [Y/N]? ${Font}"
read -r ssl_delete
case $ssl_delete in
[yY][eE][sS]|[yY])
rm -rf /data/*
echo -e "${OK} ${GreenBG} 已删除 ${Font}"
;;
*)
;;
esac
fi
if [[ -f "/data/v2ray.key" || -f "/data/v2ray.crt" ]];then
echo "证书文件已存在" echo "证书文件已存在"
~/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /data/v2ray.crt --keypath /data/v2ray.key --ecc elif [[ -f "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && -f "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" ]];then
echo "证书文件已存在"
$HOME/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /data/v2ray.crt --keypath /data/v2ray.key --ecc
judge "证书应用" judge "证书应用"
else else
ssl_install ssl_install