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

[modify] 修复版本识别异常问题

pull/290/head
wulabing 2020-08-30 21:44:54 +08:00
parent b71c36fbf0
commit 1e0cd1324e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -40,7 +40,8 @@ nginx_conf="${nginx_conf_dir}/v2ray.conf"
nginx_dir="/etc/nginx"
web_dir="/home/wwwroot"
nginx_openssl_src="/usr/local/src"
v2ray_bin_dir="/usr/bin/v2ray"
v2ray_bin_dir_old="/usr/bin/v2ray"
v2ray_bin_dir="/usr/local/bin/v2ray"
v2ray_info_file="$HOME/v2ray_info.inf"
v2ray_qr_config_file="/usr/local/vmess_qr.json"
nginx_systemd_file="/etc/systemd/system/nginx.service"
@ -819,6 +820,7 @@ uninstall_all() {
[[ -f $nginx_systemd_file ]] && rm -f $nginx_systemd_file
[[ -f $v2ray_systemd_file ]] && rm -f $v2ray_systemd_file
[[ -d $v2ray_bin_dir ]] && rm -rf $v2ray_bin_dir
[[ -d $v2ray_bin_dir_old ]] && rm -rf $v2ray_bin_dir_old
if [[ -d $nginx_dir ]]; then
echo -e "${OK} ${Green} 是否卸载 Nginx [Y/N]? ${Font}"
read -r uninstall_nginx
@ -842,7 +844,7 @@ delete_tls_key_and_crt() {
echo -e "${OK} ${GreenBG} 已清空证书遗留文件 ${Font}"
}
judge_mode() {
if [ -f $v2ray_bin_dir/v2ray ]; then
if [ -f $v2ray_bin_dir/v2ray ] || [ -f $v2ray_bin_dir_old/v2ray ]; then
if grep -q "ws" $v2ray_qr_config_file; then
shell_mode="ws"
elif grep -q "h2" $v2ray_qr_config_file; then