diff --git a/tools/v3.sh b/tools/v3.sh index a079550..d7e7977 100644 --- a/tools/v3.sh +++ b/tools/v3.sh @@ -12,6 +12,9 @@ case $v2ray_transport in 17) _transport=1 ;; +*) + _transport=$v2ray_transport + ;; esac if [[ $v2ray_transport == 17 ]]; then diff --git a/v2ray.sh b/v2ray.sh index dbc6472..1c697dc 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -74,10 +74,13 @@ v2ray_client_config="/etc/v2ray/233blog_v2ray_config.json" v2ray_pid=$(ps ux | grep "/usr/bin/v2ray/v2ray" | grep -v grep | awk '{print $2}') caddy_pid=$(pgrep "caddy") _v2ray_sh="/usr/local/sbin/v2ray" -v2ray_ver="v$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)" +v2ray_ver="$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)" . /etc/v2ray/233boy/v2ray/src/init.sh _test=true +if [[ $v2ray_ver != v* ]]; then + v2ray_ver="v$v2ray_ver" +fi if [[ ! -f $_v2ray_sh ]]; then mv -f /usr/local/bin/v2ray $_v2ray_sh chmod +x $_v2ray_sh