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

1.1.3.2 修复安装版本识别异常的bug

pull/190/head
wulabing 2020-02-24 01:23:55 +08:00
parent 1b66adc301
commit 659e4fc952
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -37,7 +37,7 @@ nginx_conf="${nginx_conf_dir}/v2ray.conf"
nginx_dir="/etc/nginx" nginx_dir="/etc/nginx"
web_dir="/home/wwwroot" web_dir="/home/wwwroot"
nginx_openssl_src="/usr/local/src" nginx_openssl_src="/usr/local/src"
v2ray_bin_file="/usr/bin/v2ray" v2ray_bin_dir="/usr/bin/v2ray"
v2ray_info_file="$HOME/v2ray_info.inf" v2ray_info_file="$HOME/v2ray_info.inf"
v2ray_qr_config_file="/usr/local/vmess_qr.json" v2ray_qr_config_file="/usr/local/vmess_qr.json"
nginx_systemd_file="/etc/systemd/system/nginx.service" nginx_systemd_file="/etc/systemd/system/nginx.service"
@ -785,7 +785,7 @@ uninstall_all(){
stop_process_systemd stop_process_systemd
[[ -f $nginx_systemd_file ]] && rm -f $nginx_systemd_file [[ -f $nginx_systemd_file ]] && rm -f $nginx_systemd_file
[[ -f $v2ray_systemd_file ]] && rm -f $v2ray_systemd_file [[ -f $v2ray_systemd_file ]] && rm -f $v2ray_systemd_file
[[ -d $v2ray_bin_file ]] && rm -rf $v2ray_bin_file [[ -d $v2ray_bin_dir ]] && rm -rf $v2ray_bin_dir
if [[ -d $nginx_dir ]] if [[ -d $nginx_dir ]]
then then
echo -e "${OK} ${Green} 是否卸载 Nginx [Y/N]? ${Font}" echo -e "${OK} ${Green} 是否卸载 Nginx [Y/N]? ${Font}"
@ -810,7 +810,7 @@ delete_tls_key_and_crt(){
echo -e "${OK} ${GreenBG} 已清空证书遗留文件 ${Font}" echo -e "${OK} ${GreenBG} 已清空证书遗留文件 ${Font}"
} }
judge_mode(){ judge_mode(){
if [ -f $v2ray_bin_file ] if [ -f $v2ray_bin_dir/v2ray ]
then then
if [[ -n $(grep "ws" $v2ray_qr_config_file) ]] if [[ -n $(grep "ws" $v2ray_qr_config_file) ]]
then then