From 6f47b99849c56e4b890ab6dd70f24ec15e6d1942 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sun, 16 Aug 2020 08:08:19 +0800 Subject: [PATCH] add --- README.md | 6 +-- config/backup.conf | 10 ++--- config/client/h2.json | 6 +-- config/client/http.json | 2 +- config/client/kcp.json | 2 +- config/client/quic.json | 2 +- config/client/tcp.json | 2 +- config/client/ws.json | 2 +- config/client/ws_tls.json | 8 ++-- config/server/h2.json | 8 ++-- config/server/include/socks.json | 2 +- config/server/include/ss.json | 2 +- install.sh | 52 ++++++++++++------------- src/ban_ad.sh | 2 +- src/ban_bt.sh | 2 +- src/ban_xx.sh | 2 +- src/client_file.sh | 2 +- src/custom_config.sh | 12 +++--- src/download-v2ray.sh | 2 +- src/init.sh | 2 +- src/mtproto-config.sh | 2 +- src/qr.sh | 8 ++-- src/socks-config.sh | 4 +- src/socks.sh | 8 ++-- src/ss-config.sh | 4 +- src/uninstall.sh | 8 ++-- src/vmess-config.sh | 64 +++++++++++++++---------------- templates/h2.json | 8 ++-- templates/multiple.json | 2 +- templates/socks.json | 2 +- templates/ss.json | 2 +- tools/quic.sh | 2 +- tools/reconfig.sh | 4 +- tools/v1xx_to_v3xx.sh | 10 ++--- tools/v3.sh | 4 +- v2ray.sh | 66 ++++++++++++++++---------------- 36 files changed, 163 insertions(+), 163 deletions(-) diff --git a/README.md b/README.md index 02e8545..509f23e 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ 最好用的 V2Ray 一键安装脚本 & 管理脚本 ## 脚本说明 -[V2Ray 一键安装脚本](https://github.com/233boy/v2ray/wiki/V2Ray%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85%E8%84%9A%E6%9C%AC) +[V2Ray 一键安装脚本](https://github.com/sagasw/v2ray/wiki/V2Ray%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85%E8%84%9A%E6%9C%AC) ## 搭建教程 -[V2Ray搭建详细图文教程](https://github.com/233boy/v2ray/wiki/V2Ray%E6%90%AD%E5%BB%BA%E8%AF%A6%E7%BB%86%E5%9B%BE%E6%96%87%E6%95%99%E7%A8%8B) +[V2Ray搭建详细图文教程](https://github.com/sagasw/v2ray/wiki/V2Ray%E6%90%AD%E5%BB%BA%E8%AF%A6%E7%BB%86%E5%9B%BE%E6%96%87%E6%95%99%E7%A8%8B) ## 资助 V2Ray 请考虑 [资助 V2Ray 发展](https://www.v2ray.com/chapter_00/02_donate.html) ## 更多 V2Ray 教程文章 -https://github.com/233boy/v2ray/wiki +https://github.com/sagasw/v2ray/wiki diff --git a/config/backup.conf b/config/backup.conf index 949592d..6d4120c 100644 --- a/config/backup.conf +++ b/config/backup.conf @@ -33,7 +33,7 @@ v2ray_dynamicPort_start=10000 v2ray_dynamicPort_end=20000 #---- 域名 ----- -domain=233blog.com +domain=sagasw.com #---- caddy ----- caddy= @@ -45,7 +45,7 @@ shadowsocks= ssport=6666 #---- Shadowsocks 密码 ----- -sspass=233blog.com +sspass=sagasw.com #---- Shadowsocks 加密协议 ----- ssciphers=chacha20-ietf @@ -57,7 +57,7 @@ ban_ad= path_status= #---- 伪装的路径 ----- -path=233blog +path=sagasw #---- 伪装的网址 ----- proxy_site=https://liyafly.com @@ -69,10 +69,10 @@ socks= socks_port=233 #---- Socks 用户名 ----- -socks_username=233blog +socks_username=sagasw #---- Socks 密码 ----- -socks_userpass=233blog.com +socks_userpass=sagasw.com #---- MTProto ----- mtproto= diff --git a/config/client/h2.json b/config/client/h2.json index d7a0d39..7218b02 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { @@ -22,9 +22,9 @@ "security": "tls", "httpSettings": { "host": [ - "233blog.com" + "sagasw.com" ], - "path": "/233blog" + "path": "/sagasw" } }, "mux": { diff --git a/config/client/http.json b/config/client/http.json index ac87af1..9074db1 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { diff --git a/config/client/kcp.json b/config/client/kcp.json index dafda17..eb061d7 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { diff --git a/config/client/quic.json b/config/client/quic.json index 01b2c06..549c712 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { diff --git a/config/client/tcp.json b/config/client/tcp.json index 687d80e..6aa596d 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { diff --git a/config/client/ws.json b/config/client/ws.json index 108bc49..118a91d 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index 85c1625..2091ca8 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -5,7 +5,7 @@ "settings": { "vnext": [ { - "address": "233blog.com", + "address": "sagasw.com", "port": 2333, "users": [ { @@ -21,12 +21,12 @@ "network": "ws", "security": "tls", "tlsSettings": { - "serverName": "233blog.com" + "serverName": "sagasw.com" }, "wsSettings": { - "path": "/233blog", + "path": "/sagasw", "headers": { - "Host": "233blog.com" + "Host": "sagasw.com" } } }, diff --git a/config/server/h2.json b/config/server/h2.json index 8c8cdf3..0812dd5 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -21,16 +21,16 @@ "network": "h2", "httpSettings": { "host": [ - "233blog.com" + "sagasw.com" ], - "path": "/233blog" + "path": "/sagasw" }, "security": "tls", "tlsSettings": { "certificates": [ { - "certificateFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.cer", - "keyFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.key" + "certificateFile": "/usr/local/etc/v2ray/sagasw/v2ray/config/sagasw.com.cer", + "keyFile": "/usr/local/etc/v2ray/sagasw/v2ray/config/sagasw.com.key" } ] } diff --git a/config/server/include/socks.json b/config/server/include/socks.json index ab38a8a..fd02595 100644 --- a/config/server/include/socks.json +++ b/config/server/include/socks.json @@ -6,7 +6,7 @@ "accounts": [ { "user": "233v2.com", - "pass": "233blog.com" + "pass": "sagasw.com" } ], "udp": true, diff --git a/config/server/include/ss.json b/config/server/include/ss.json index 537ceb1..3f44c3e 100644 --- a/config/server/include/ss.json +++ b/config/server/include/ss.json @@ -3,7 +3,7 @@ "port": 6666, "settings": { "method": "chacha20-ietf", - "password": "233blog.com", + "password": "sagasw.com", "network": "tcp,udp", "level": 1, "ota": false diff --git a/install.sh b/install.sh index e1974aa..31d0565 100644 --- a/install.sh +++ b/install.sh @@ -70,10 +70,10 @@ fi uuid=$(cat /proc/sys/kernel/random/uuid) old_id="e55c8d17-2cf3-b21a-bcf1-eeacb011ed79" -v2ray_server_config="/etc/v2ray/config.json" -v2ray_client_config="/etc/v2ray/233blog_v2ray_config.json" -backup="/etc/v2ray/233blog_v2ray_backup.conf" -_v2ray_sh="/usr/local/sbin/v2ray" +v2ray_server_config="/usr/local/etc/v2ray/config.json" +v2ray_client_config="/usr/local/etc/v2ray/sagasw_v2ray_config.json" +backup="/usr/local/etc/v2ray/sagasw_v2ray_backup.conf" +_v2ray_sh="/usr/local/bin/v2ray" systemd=true # _test=true @@ -123,7 +123,7 @@ ciphers=( ) _load() { - local _dir="/etc/v2ray/233boy/v2ray/src/" + local _dir="/usr/local/etc/v2ray/sagasw/v2ray/src/" . "${_dir}$@" } _sys_timezone() { @@ -332,7 +332,7 @@ tls_config() { while :; do echo echo -e "请输入一个 $magenta正确的域名$none,一定一定一定要正确,不!能!出!错!" - read -p "(例如:233blog.com): " domain + read -p "(例如:sagasw.com): " domain [ -z "$domain" ] && error && continue echo echo @@ -456,9 +456,9 @@ path_config_ask() { path_config() { echo while :; do - echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /233blog , 那么只需要输入 233blog 即可" - read -p "$(echo -e "(默认: [${cyan}233blog$none]):")" path - [[ -z $path ]] && path="233blog" + echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /sagasw , 那么只需要输入 sagasw 即可" + read -p "$(echo -e "(默认: [${cyan}sagasw$none]):")" path + [[ -z $path ]] && path="sagasw" case $path in *[/$]*) @@ -620,8 +620,8 @@ shadowsocks_password_config() { while :; do echo -e "请输入 "$yellow"Shadowsocks"$none" 密码" - read -p "$(echo -e "(默认密码: ${cyan}233blog.com$none)"): " sspass - [ -z "$sspass" ] && sspass="233blog.com" + read -p "$(echo -e "(默认密码: ${cyan}sagasw.com$none)"): " sspass + [ -z "$sspass" ] && sspass="sagasw.com" case $sspass in *[/$]*) echo @@ -787,7 +787,7 @@ install_v2ray() { $cmd install -y lrzsz git zip unzip curl wget qrencode libcap fi ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - [ -d /etc/v2ray ] && rm -rf /etc/v2ray + [ -d /usr/local/etc/v2ray ] && rm -rf /usr/local/etc/v2ray # date -s "$(curl -sI g.cn | grep Date | cut -d' ' -f3-6)Z" _sys_timezone _sys_time @@ -801,16 +801,16 @@ install_v2ray() { echo exit 1 fi - mkdir -p /etc/v2ray/233boy/v2ray - cp -rf $(pwd)/* /etc/v2ray/233boy/v2ray + mkdir -p /usr/local/etc/v2ray/sagasw/v2ray + cp -rf $(pwd)/* /usr/local/etc/v2ray/sagasw/v2ray else pushd /tmp - git clone https://github.com/233boy/v2ray -b "$_gitbranch" /etc/v2ray/233boy/v2ray --depth=1 + git clone https://github.com/saga/v2ray -b "$_gitbranch" /usr/local/etc/v2ray/sagasw/v2ray --depth=1 popd fi - if [[ ! -d /etc/v2ray/233boy/v2ray ]]; then + if [[ ! -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then echo echo -e "$red 哎呀呀...克隆脚本仓库出错了...$none" echo @@ -895,8 +895,8 @@ del_port() { } config() { - cp -f /etc/v2ray/233boy/v2ray/config/backup.conf $backup - cp -f /etc/v2ray/233boy/v2ray/v2ray.sh $_v2ray_sh + cp -f /usr/local/etc/v2ray/sagasw/v2ray/config/backup.conf $backup + cp -f /usr/local/etc/v2ray/sagasw/v2ray/v2ray.sh $_v2ray_sh chmod +x $_v2ray_sh v2ray_id=$uuid @@ -948,13 +948,13 @@ backup_config() { sed -i "30s/=10000/=$v2ray_dynamic_port_start_input/; 33s/=20000/=$v2ray_dynamic_port_end_input/" $backup fi if [[ $shadowsocks ]]; then - sed -i "42s/=/=true/; 45s/=6666/=$ssport/; 48s/=233blog.com/=$sspass/; 51s/=chacha20-ietf/=$ssciphers/" $backup + sed -i "42s/=/=true/; 45s/=6666/=$ssport/; 48s/=sagasw.com/=$sspass/; 51s/=chacha20-ietf/=$ssciphers/" $backup fi - [[ $v2ray_transport == [45] ]] && sed -i "36s/=233blog.com/=$domain/" $backup + [[ $v2ray_transport == [45] ]] && sed -i "36s/=sagasw.com/=$domain/" $backup [[ $caddy ]] && sed -i "39s/=/=true/" $backup [[ $ban_ad ]] && sed -i "54s/=/=true/" $backup if [[ $is_path ]]; then - sed -i "57s/=/=true/; 60s/=233blog/=$path/" $backup + sed -i "57s/=/=true/; 60s/=sagasw/=$path/" $backup sed -i "63s#=https://liyafly.com#=$proxy_site#" $backup fi } @@ -999,14 +999,14 @@ show_config_info() { } install() { - if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then + if [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f $backup && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then echo echo " 大佬...你已经安装 V2Ray 啦...无需重新安装" echo echo -e " $yellow输入 ${cyan}v2ray${none} $yellow即可管理 V2Ray${none}" echo exit 1 - elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then + elif [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f /usr/local/etc/v2ray/sagasw_v2ray_backup.txt && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then echo echo " 如果你需要继续安装.. 请先卸载旧版本" echo @@ -1041,7 +1041,7 @@ install() { } uninstall() { - if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then + if [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f $backup && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then . $backup if [[ $mark ]]; then _load uninstall.sh @@ -1051,7 +1051,7 @@ uninstall() { echo fi - elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then + elif [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f /usr/local/etc/v2ray/sagasw_v2ray_backup.txt && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then echo echo -e " $yellow输入 ${cyan}v2ray uninstall${none} $yellow即可卸载${none}" echo @@ -1121,4 +1121,4 @@ while :; do error ;; esac -done +done \ No newline at end of file diff --git a/src/ban_ad.sh b/src/ban_ad.sh index bab0a4f..6b052e5 100644 --- a/src/ban_ad.sh +++ b/src/ban_ad.sh @@ -1,6 +1,6 @@ # ban ad if [[ $ban_ad ]]; then - ban_ad_file="/etc/v2ray/233boy/v2ray/config/server/include/ad.json" + ban_ad_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/ad.json" sed -i "/\/\/include_ban_ad/r $ban_ad_file" $v2ray_server_config sed -i "s#//include_ban_ad#,#" $v2ray_server_config fi diff --git a/src/ban_bt.sh b/src/ban_bt.sh index b5db3bc..c3af630 100644 --- a/src/ban_bt.sh +++ b/src/ban_bt.sh @@ -1,6 +1,6 @@ # ban bt if [[ $ban_bt ]]; then - ban_bt_file="/etc/v2ray/233boy/v2ray/config/server/include/bt.json" + ban_bt_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/bt.json" sed -i "/\/\/include_ban_bt/r $ban_bt_file" $v2ray_server_config sed -i "s#//include_ban_bt#,#" $v2ray_server_config fi diff --git a/src/ban_xx.sh b/src/ban_xx.sh index 5287859..e761f98 100644 --- a/src/ban_xx.sh +++ b/src/ban_xx.sh @@ -1,4 +1,4 @@ # ban domain -ban_xx_file="/etc/v2ray/233boy/v2ray/config/server/include/ban.json" +ban_xx_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/ban.json" sed -i "/\/\/include_ban_xx/r $ban_xx_file" $v2ray_server_config sed -i "s#//include_ban_xx#,#" $v2ray_server_config diff --git a/src/client_file.sh b/src/client_file.sh index b47e3f7..f997b0c 100644 --- a/src/client_file.sh +++ b/src/client_file.sh @@ -2,7 +2,7 @@ _load vmess-config.sh _get_client_file() { local _link="$(cat $v2ray_client_config | tr -d [:space:] | base64 -w0)" - local link="https://233boy.github.io/tools/json.html#${_link}" + local link="https://sagasw.github.io/tools/json.html#${_link}" echo echo "---------- V2Ray 客户端配置文件链接 -------------" echo diff --git a/src/custom_config.sh b/src/custom_config.sh index 909ff9c..8d3b746 100644 --- a/src/custom_config.sh +++ b/src/custom_config.sh @@ -1,18 +1,18 @@ # custom inbounds config -if [[ -f /etc/v2ray/custom/in.json ]]; then - custom_config_file="/etc/v2ray/custom/in.json" +if [[ -f /usr/local/etc/v2ray/custom/in.json ]]; then + custom_config_file="/usr/local/etc/v2ray/custom/in.json" sed -i "/\/\/include_in_config/r $custom_config_file" $v2ray_server_config sed -i "s#//include_in_config#,#" $v2ray_server_config fi # custom outbounds config -if [[ -f /etc/v2ray/custom/out.json ]]; then - custom_config_file="/etc/v2ray/custom/out.json" +if [[ -f /usr/local/etc/v2ray/custom/out.json ]]; then + custom_config_file="/usr/local/etc/v2ray/custom/out.json" sed -i "/\/\/include_out_config/r $custom_config_file" $v2ray_server_config sed -i "s#//include_out_config#,#" $v2ray_server_config fi # custom rules -if [[ -f /etc/v2ray/custom/rules.json ]]; then - custom_rules_file="/etc/v2ray/custom/rules.json" +if [[ -f /usr/local/etc/v2ray/custom/rules.json ]]; then + custom_rules_file="/usr/local/etc/v2ray/custom/rules.json" sed -i "/\/\/include_rules/r $custom_rules_file" $v2ray_server_config sed -i "s#//include_rules#,#" $v2ray_server_config fi \ No newline at end of file diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index 270f284..32e5768 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -60,5 +60,5 @@ _update_v2ray_version() { _mkdir_dir() { mkdir -p /var/log/v2ray - mkdir -p /etc/v2ray + mkdir -p /usr/local/etc/v2ray } diff --git a/src/init.sh b/src/init.sh index a1077b8..5176b16 100644 --- a/src/init.sh +++ b/src/init.sh @@ -18,6 +18,6 @@ _mkdir() { } _load() { - local _dir="/etc/v2ray/233boy/v2ray/src/" + local _dir="/usr/local/etc/v2ray/sagasw/v2ray/src/" . "${_dir}$@" } \ No newline at end of file diff --git a/src/mtproto-config.sh b/src/mtproto-config.sh index 241d24a..15fb123 100644 --- a/src/mtproto-config.sh +++ b/src/mtproto-config.sh @@ -1,6 +1,6 @@ # shadowsocks config if [[ $mtproto ]]; then - mtproto_file="/etc/v2ray/233boy/v2ray/config/server/include/mtproto.json" + mtproto_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/mtproto.json" mtproto_file_tmp="/tmp/ss.json.tmp" cp -f $mtproto_file $mtproto_file_tmp sed -i "s/6666/$mtproto_port/; s/bb8a7fbd7190e345024845f07373ec48/$mtproto_secret/" $mtproto_file_tmp diff --git a/src/qr.sh b/src/qr.sh index 5efcf86..adf797a 100644 --- a/src/qr.sh +++ b/src/qr.sh @@ -1,6 +1,6 @@ _qr_create() { - local vmess="vmess://$(cat /etc/v2ray/vmess_qr.json | base64 -w 0)" - local link="https://233boy.github.io/tools/qr.html#${vmess}" + local vmess="vmess://$(cat /usr/local/etc/v2ray/vmess_qr.json | base64 -w 0)" + local link="https://sagasw.github.io/tools/qr.html#${vmess}" echo echo "---------- V2Ray 二维码链接 适用于 V2RayNG v0.4.1+ / Kitsunebi -------------" echo @@ -13,11 +13,11 @@ _qr_create() { echo " V2Ray 客户端使用教程: https://233v2.com/post/4/" echo echo - rm -rf /etc/v2ray/vmess_qr.json + rm -rf /usr/local/etc/v2ray/vmess_qr.json } _ss_qr() { local ss_link="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#233v2.com_ss_${ip}" - local link="https://233boy.github.io/tools/qr.html#${ss_link}" + local link="https://sagasw.github.io/tools/qr.html#${ss_link}" echo echo "---------- Shadowsocks 二维码链接 -------------" echo diff --git a/src/socks-config.sh b/src/socks-config.sh index d6cce16..52f65c9 100644 --- a/src/socks-config.sh +++ b/src/socks-config.sh @@ -1,9 +1,9 @@ # Socks config if [[ $socks ]]; then - socks_file="/etc/v2ray/233boy/v2ray/config/server/include/socks.json" + socks_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/socks.json" socks_file_tmp="/tmp/socks.json.tmp" cp -f $socks_file $socks_file_tmp - sed -i "s/6666/$socks_port/; s/233v2.com/$socks_username/; s/233blog.com/$socks_userpass/" $socks_file_tmp + sed -i "s/6666/$socks_port/; s/233v2.com/$socks_username/; s/sagasw.com/$socks_userpass/" $socks_file_tmp sed -i "/\/\/include_socks/r $socks_file_tmp" $v2ray_server_config sed -i "s#//include_socks#,#" $v2ray_server_config rm -rf $socks_file_tmp diff --git a/src/socks.sh b/src/socks.sh index 08268fe..8543e78 100644 --- a/src/socks.sh +++ b/src/socks.sh @@ -204,8 +204,8 @@ socks_port_config() { socks_user_config() { echo while :; do - read -p "$(echo -e "请输入$yellow用户名$none...(默认用户名: ${cyan}233blog$none)"): " new_socks_username - [ -z "$new_socks_username" ] && new_socks_username="233blog" + read -p "$(echo -e "请输入$yellow用户名$none...(默认用户名: ${cyan}sagasw$none)"): " new_socks_username + [ -z "$new_socks_username" ] && new_socks_username="sagasw" case $new_socks_username in *[/$]* | *\&*) echo @@ -228,8 +228,8 @@ socks_user_config() { socks_pass_config() { echo while :; do - read -p "$(echo -e "请输入$yellow密码$none...(默认密码: ${cyan}233blog.com$none)"): " new_socks_userpass - [ -z "$new_socks_userpass" ] && new_socks_userpass="233blog.com" + read -p "$(echo -e "请输入$yellow密码$none...(默认密码: ${cyan}sagasw.com$none)"): " new_socks_userpass + [ -z "$new_socks_userpass" ] && new_socks_userpass="sagasw.com" case $new_socks_userpass in *[/$]* | *\&*) echo diff --git a/src/ss-config.sh b/src/ss-config.sh index 18233dc..9fe934d 100644 --- a/src/ss-config.sh +++ b/src/ss-config.sh @@ -1,9 +1,9 @@ # shadowsocks config if [[ $shadowsocks ]]; then - ss_file="/etc/v2ray/233boy/v2ray/config/server/include/ss.json" + ss_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/include/ss.json" ss_file_tmp="/tmp/ss.json.tmp" cp -f $ss_file $ss_file_tmp - sed -i "s/6666/$ssport/; s/chacha20-ietf/$ssciphers/; s/233blog.com/$sspass/" $ss_file_tmp + sed -i "s/6666/$ssport/; s/chacha20-ietf/$ssciphers/; s/sagasw.com/$sspass/" $ss_file_tmp sed -i "/\/\/include_ss/r $ss_file_tmp" $v2ray_server_config sed -i "s#//include_ss#,#" $v2ray_server_config rm -rf $ss_file_tmp diff --git a/src/uninstall.sh b/src/uninstall.sh index a2e881b..d9e112b 100644 --- a/src/uninstall.sh +++ b/src/uninstall.sh @@ -87,7 +87,7 @@ if [[ $is_uninstall_v2ray && $is_uninstall_caddy ]]; then rm -rf /usr/bin/v2ray rm -rf $_v2ray_sh sed -i '/alias v2ray=/d' /root/.bashrc - rm -rf /etc/v2ray + rm -rf /usr/local/etc/v2ray rm -rf /var/log/v2ray # [ $caddy_pid ] && systemctl stop caddy @@ -114,7 +114,7 @@ if [[ $is_uninstall_v2ray && $is_uninstall_caddy ]]; then echo echo "如果你觉得这个脚本有哪些地方不够好的话...请告诉我" echo - echo "反馈问题: https://github.com/233boy/v2ray/issues" + echo "反馈问题: https://github.com/sagasw/v2ray/issues" echo elif [[ $is_uninstall_v2ray ]]; then @@ -150,7 +150,7 @@ elif [[ $is_uninstall_v2ray ]]; then rm -rf /usr/bin/v2ray rm -rf $_v2ray_sh sed -i '/alias v2ray=/d' /root/.bashrc - rm -rf /etc/v2ray + rm -rf /usr/local/etc/v2ray rm -rf /var/log/v2ray if [[ $systemd ]]; then systemctl disable v2ray >/dev/null 2>&1 @@ -165,6 +165,6 @@ elif [[ $is_uninstall_v2ray ]]; then echo echo "如果你觉得这个脚本有哪些地方不够好的话...请告诉我" echo - echo "反馈问题: https://github.com/233boy/v2ray/issues" + echo "反馈问题: https://github.com/sagasw/v2ray/issues" echo fi diff --git a/src/vmess-config.sh b/src/vmess-config.sh index cb7e1f6..1c4ca23 100644 --- a/src/vmess-config.sh +++ b/src/vmess-config.sh @@ -1,52 +1,52 @@ # config file case $v2ray_transport in 1) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/tcp.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/tcp.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/tcp.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/tcp.json" ;; 2) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/http.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/http.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/http.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/http.json" ;; 3) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/ws.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/ws.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/ws.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/ws.json" ;; 4) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/ws.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/ws_tls.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/ws.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/ws_tls.json" ;; 5) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/h2.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/h2.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/h2.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/h2.json" ;; [6-9] | 10 | 11) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/kcp.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/kcp.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/kcp.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/kcp.json" ;; 1[2-7]) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/quic.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/quic.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/quic.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/quic.json" ;; 18) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/dynamic/tcp.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/tcp.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/dynamic/tcp.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/tcp.json" ;; 19) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/dynamic/http.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/http.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/dynamic/http.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/http.json" ;; 20) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/dynamic/ws.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/ws.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/dynamic/ws.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/ws.json" ;; 2[1-6]) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/dynamic/kcp.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/kcp.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/dynamic/kcp.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/kcp.json" ;; *) - v2ray_server_config_file="/etc/v2ray/233boy/v2ray/config/server/dynamic/quic.json" - v2ray_client_config_file="/etc/v2ray/233boy/v2ray/config/client/quic.json" + v2ray_server_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/server/dynamic/quic.json" + v2ray_client_config_file="/usr/local/etc/v2ray/sagasw/v2ray/config/client/quic.json" ;; esac @@ -66,11 +66,11 @@ fi # change domain and path, or header type case $v2ray_transport in 5) - sed -i "24s/233blog.com/$domain/" $v2ray_server_config + sed -i "24s/sagasw.com/$domain/" $v2ray_server_config if [[ $is_path ]]; then - sed -i "26s/233blog/$path/" $v2ray_server_config + sed -i "26s/sagasw/$path/" $v2ray_server_config else - sed -i "26s/233blog//" $v2ray_server_config + sed -i "26s/sagasw//" $v2ray_server_config fi ;; 7 | 13 | 22 | 28) @@ -98,14 +98,14 @@ esac ## change client config file [[ -z $ip ]] && get_ip if [[ $v2ray_transport == [45] ]]; then - sed -i "s/233blog.com/$domain/; 9s/2333/443/; 12s/$old_id/$v2ray_id/; 13s/233/$alterId/" $v2ray_client_config + sed -i "s/sagasw.com/$domain/; 9s/2333/443/; 12s/$old_id/$v2ray_id/; 13s/233/$alterId/" $v2ray_client_config if [[ $is_path ]]; then - sed -i "27s/233blog/$path/" $v2ray_client_config + sed -i "27s/sagasw/$path/" $v2ray_client_config else - sed -i "27s/233blog//" $v2ray_client_config + sed -i "27s/sagasw//" $v2ray_client_config fi else - sed -i "s/233blog.com/$ip/; 9s/2333/$v2ray_port/; 12s/$old_id/$v2ray_id/; 13s/233/$alterId/" $v2ray_client_config + sed -i "s/sagasw.com/$ip/; 9s/2333/$v2ray_port/; 12s/$old_id/$v2ray_id/; 13s/233/$alterId/" $v2ray_client_config fi -# zip -q -r -j --password "233blog.com" /etc/v2ray/233blog_v2ray.zip $v2ray_client_config +# zip -q -r -j --password "sagasw.com" /usr/local/etc/v2ray/sagasw_v2ray.zip $v2ray_client_config diff --git a/templates/h2.json b/templates/h2.json index db5d889..82e66ee 100644 --- a/templates/h2.json +++ b/templates/h2.json @@ -14,16 +14,16 @@ "network": "h2", "httpSettings": { "host": [ - "233blog.com" // domain + "sagasw.com" // domain ], - "path": "/233blog" // path + "path": "/sagasw" // path }, "security": "tls", "tlsSettings": { "certificates": [ { - "certificateFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.cer", - "keyFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.key" + "certificateFile": "/usr/local/etc/v2ray/sagasw/v2ray/config/sagasw.com.cer", + "keyFile": "/usr/local/etc/v2ray/sagasw/v2ray/config/sagasw.com.key" } ] } diff --git a/templates/multiple.json b/templates/multiple.json index 8e41ec1..f70483f 100644 --- a/templates/multiple.json +++ b/templates/multiple.json @@ -26,7 +26,7 @@ "port": 6666, // port "settings": { "method": "chacha20-ietf", // options > [aes-256-cfb, aes-128-cfb, chacha20, chacha20-ietf, aes-256-gcm, aes-128-gcm, chacha20-ietf-poly1305] - "password": "233blog.com", // password + "password": "sagasw.com", // password "network": "tcp,udp", "level": 1, "ota": false diff --git a/templates/socks.json b/templates/socks.json index 5258522..f95e262 100644 --- a/templates/socks.json +++ b/templates/socks.json @@ -6,7 +6,7 @@ "accounts": [ { "user": "233v2.com", // username - "pass": "233blog.com" // passowrd + "pass": "sagasw.com" // passowrd } ], "udp": true, diff --git a/templates/ss.json b/templates/ss.json index ee28975..68381ed 100644 --- a/templates/ss.json +++ b/templates/ss.json @@ -3,7 +3,7 @@ "port": 6666, // port "settings": { "method": "chacha20-ietf", // options > [aes-256-cfb, aes-128-cfb, chacha20, chacha20-ietf, aes-256-gcm, aes-128-gcm, chacha20-ietf-poly1305] - "password": "233blog.com", // password + "password": "sagasw.com", // password "network": "tcp,udp", "level": 1, "ota": false diff --git a/tools/quic.sh b/tools/quic.sh index 83bdab4..682fe49 100644 --- a/tools/quic.sh +++ b/tools/quic.sh @@ -1,5 +1,5 @@ #!/bin/bash -backup="/etc/v2ray/233blog_v2ray_backup.conf" +backup="/usr/local/etc/v2ray/sagasw_v2ray_backup.conf" . $backup if [[ $v2ray_transport -ge 13 ]]; then tmp_transport=$(($v2ray_transport +6)) diff --git a/tools/reconfig.sh b/tools/reconfig.sh index 65d6747..2a6aef1 100644 --- a/tools/reconfig.sh +++ b/tools/reconfig.sh @@ -1,6 +1,6 @@ #!/bin/bash uuid=$(cat /proc/sys/kernel/random/uuid) -cat >/etc/v2ray/233blog_v2ray_backup.conf.tmp <<-EOF +cat >/usr/local/etc/v2ray/sagasw_v2ray_backup.conf.tmp <<-EOF # ----------------------------------- # 警告...请不要修改或删除这个文件...谢谢 # 警告...请不要修改或删除这个文件...谢谢 @@ -66,7 +66,7 @@ ws_path=$ws_path proxy_site=$proxy_site EOF rm -rf $backup -mv -f /etc/v2ray/233blog_v2ray_backup.conf.tmp /etc/v2ray/233blog_v2ray_backup.conf +mv -f /usr/local/etc/v2ray/sagasw_v2ray_backup.conf.tmp /usr/local/etc/v2ray/sagasw_v2ray_backup.conf echo echo -e " .... 哇哦.. .." echo diff --git a/tools/v1xx_to_v3xx.sh b/tools/v1xx_to_v3xx.sh index 221d4be..e483ce4 100644 --- a/tools/v1xx_to_v3xx.sh +++ b/tools/v1xx_to_v3xx.sh @@ -1,5 +1,5 @@ #!/bin/bash -backup="/etc/v2ray/233blog_v2ray_backup.txt" +backup="/usr/local/etc/v2ray/sagasw_v2ray_backup.txt" v2ray_transport=$(sed -n '17p' $backup) v2ray_port=$(sed -n '19p' $backup) v2ray_id=$(sed -n '21p' $backup) @@ -28,7 +28,7 @@ if [[ $ws_path_status == "true" ]]; then is_ws_path=true fi -cat >/etc/v2ray/233blog_v2ray_backup.conf <<-EOF +cat >/usr/local/etc/v2ray/sagasw_v2ray_backup.conf <<-EOF # ----------------------------------- # 警告...请不要修改或删除这个文件...谢谢 # 警告...请不要修改或删除这个文件...谢谢 @@ -100,10 +100,10 @@ socks= socks_port=233 #---- Socks 用户名 ----- -socks_username=233blog +socks_username=sagasw #---- Socks 密码 ----- -socks_userpass=233blog.com +socks_userpass=sagasw.com #---- MTProto ----- mtproto= @@ -118,7 +118,7 @@ mtproto_secret=lalala ban_bt=true EOF if [[ -f /usr/local/bin/v2ray ]]; then - cp -f /etc/v2ray/233boy/v2ray/v2ray.sh /usr/local/sbin/v2ray + cp -f /usr/local/etc/v2ray/sagasw/v2ray/v2ray.sh /usr/local/sbin/v2ray chmod +x /usr/local/sbin/v2ray rm -rf $backup rm -rf /usr/local/bin/v2ray diff --git a/tools/v3.sh b/tools/v3.sh index 11f8821..b2e32b5 100644 --- a/tools/v3.sh +++ b/tools/v3.sh @@ -93,10 +93,10 @@ socks= socks_port=233 #---- Socks 用户名 ----- -socks_username=233blog +socks_username=sagasw #---- Socks 密码 ----- -socks_userpass=233blog.com +socks_userpass=sagasw.com #---- MTProto ----- mtproto= diff --git a/v2ray.sh b/v2ray.sh index 3cc5c4a..e26a903 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -52,22 +52,22 @@ if [[ $(command -v yum) ]]; then fi -backup="/etc/v2ray/233blog_v2ray_backup.conf" +backup="/usr/local/etc/v2ray/sagasw_v2ray_backup.conf" -if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then +if [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f $backup && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then . $backup -elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then +elif [[ -f /usr/local/bin/v2ray && -f /usr/local/etc/v2ray/config.json ]] && [[ -f /usr/local/etc/v2ray/sagasw_v2ray_backup.txt && -d /usr/local/etc/v2ray/sagasw/v2ray ]]; then - . /etc/v2ray/233boy/v2ray/tools/v1xx_to_v3xx.sh + . /usr/local/etc/v2ray/sagasw/v2ray/tools/v1xx_to_v3xx.sh else echo -e " 哎呀哎呀…… ${red}出错咯...请重新安装V2Ray${none} ${yellow}~(^_^) ${none}" && exit 1 fi if [[ $mark != "v3" ]]; then - . /etc/v2ray/233boy/v2ray/tools/v3.sh + . /usr/local/etc/v2ray/sagasw/v2ray/tools/v3.sh fi if [[ $v2ray_transport -ge 18 ]]; then dynamicPort=true @@ -79,13 +79,13 @@ fi uuid=$(cat /proc/sys/kernel/random/uuid) old_id="e55c8d17-2cf3-b21a-bcf1-eeacb011ed79" -v2ray_server_config="/etc/v2ray/config.json" -v2ray_client_config="/etc/v2ray/233blog_v2ray_config.json" -v2ray_pid=$(pgrep -f /usr/bin/v2ray/v2ray) +v2ray_server_config="/usr/local/etc/v2ray/config.json" +v2ray_client_config="/usr/local/etc/v2ray/sagasw_v2ray_config.json" +v2ray_pid=$(pgrep -f /usr/local/bin/v2ray) caddy_pid=$(pgrep -f /usr/local/bin/caddy) _v2ray_sh="/usr/local/sbin/v2ray" -v2ray_ver="$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)" -. /etc/v2ray/233boy/v2ray/src/init.sh +v2ray_ver="$(/usr/local/bin/v2ray -version | head -n 1 | cut -d " " -f2)" +. /usr/local/etc/v2ray/sagasw/v2ray/src/init.sh systemd=true # _test=true @@ -129,7 +129,7 @@ create_vmess_URL_config() { [[ -z $net ]] && get_transport_args if [[ $v2ray_transport == [45] ]]; then - cat >/etc/v2ray/vmess_qr.json <<-EOF + cat >/usr/local/etc/v2ray/vmess_qr.json <<-EOF { "v": "2", "ps": "233v2.com_${domain}", @@ -146,7 +146,7 @@ create_vmess_URL_config() { EOF else [[ -z $ip ]] && get_ip - cat >/etc/v2ray/vmess_qr.json <<-EOF + cat >/usr/local/etc/v2ray/vmess_qr.json <<-EOF { "v": "2", "ps": "233v2.com_${ip}", @@ -384,8 +384,8 @@ shadowsocks_password_config() { while :; do echo -e "请输入 "$yellow"Shadowsocks"$none" 密码" - read -p "$(echo -e "(默认密码: ${cyan}233blog.com$none)"): " new_sspass - [ -z "$new_sspass" ] && new_sspass="233blog.com" + read -p "$(echo -e "(默认密码: ${cyan}sagasw.com$none)"): " new_sspass + [ -z "$new_sspass" ] && new_sspass="sagasw.com" case $new_sspass in *[/$]*) echo @@ -947,7 +947,7 @@ tls_config() { echo echo echo -e "请输入一个 $magenta正确的域名$none,一定一定一定要正确,不!能!出!错!" - read -p "(例如:233blog.com): " new_domain + read -p "(例如:sagasw.com): " new_domain [ -z "$new_domain" ] && error && continue echo echo @@ -1158,9 +1158,9 @@ path_config_ask() { path_config() { echo while :; do - echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /233blog , 那么只需要输入 233blog 即可" - read -p "$(echo -e "(默认: [${cyan}233blog$none]):")" new_path - [[ -z $new_path ]] && new_path="233blog" + echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /sagasw , 那么只需要输入 sagasw 即可" + read -p "$(echo -e "(默认: [${cyan}sagasw$none]):")" new_path + [[ -z $new_path ]] && new_path="sagasw" case $new_path in *[/$]*) @@ -1612,7 +1612,7 @@ change_path_config() { if [[ $v2ray_transport == [45] ]] && [[ $caddy && $is_path ]]; then echo while :; do - echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /233blog , 那么只需要输入 233blog 即可" + echo -e "请输入想要 ${magenta}用来分流的路径$none , 例如 /sagasw , 那么只需要输入 sagasw 即可" read -p "$(echo -e "(当前分流的路径: [${cyan}/${path}$none]):")" new_path [[ -z $new_path ]] && error && continue @@ -1850,7 +1850,7 @@ blocked_hosts() { echo echo "备注: 广告拦截是基于 域名 拦截的..所以也许会造成浏览网页的时候出现部分元素留白..或者其他问题" echo - echo "反馈问题或请求拦截更多域名: https://github.com/233boy/v2ray/issues" + echo "反馈问题或请求拦截更多域名: https://github.com/sagasw/v2ray/issues" echo echo -e "当前广告拦截状态: $_info" echo @@ -2143,15 +2143,15 @@ get_v2ray_config() { echo echo "开始下载....请选择 V2Ray 客户端配置文件保存位置" echo - # sz /etc/v2ray/233blog_v2ray.zip - local tmpfile="/tmp/233blog_v2ray_config_$RANDOM.json" + # sz /usr/local/etc/v2ray/sagasw_v2ray.zip + local tmpfile="/tmp/sagasw_v2ray_config_$RANDOM.json" cp -f $v2ray_client_config $tmpfile sz $tmpfile echo echo echo -e "$green 下载完成咯...$none" echo - # echo -e "$yellow 解压密码 = ${cyan}233blog.com$none" + # echo -e "$yellow 解压密码 = ${cyan}sagasw.com$none" # echo echo -e "$yellow SOCKS 监听端口 = ${cyan}2333${none}" echo @@ -2242,9 +2242,9 @@ get_v2ray_config_info_link() { echo echo -e "$green 正在生成链接.... 稍等片刻即可....$none" echo - create_v2ray_config_text >/tmp/233blog_v2ray.txt + create_v2ray_config_text >/tmp/sagasw_v2ray.txt local random=$(echo $RANDOM-$RANDOM-$RANDOM | base64 -w 0) - local link=$(curl -s --upload-file /tmp/233blog_v2ray.txt "https://transfer.sh/${random}_233v2_v2ray.txt") + local link=$(curl -s --upload-file /tmp/sagasw_v2ray.txt "https://transfer.sh/${random}_233v2_v2ray.txt") if [[ $link ]]; then echo echo "---------- V2Ray 配置信息链接-------------" @@ -2262,7 +2262,7 @@ get_v2ray_config_info_link() { echo -e "$red 哎呀呀呀...出错咯...请重试$none" echo fi - rm -rf /tmp/233blog_v2ray.txt + rm -rf /tmp/sagasw_v2ray.txt } get_v2ray_config_qr_link() { @@ -2273,7 +2273,7 @@ get_v2ray_config_qr_link() { } get_v2ray_vmess_URL_link() { create_vmess_URL_config - local vmess="vmess://$(cat /etc/v2ray/vmess_qr.json | base64 -w 0)" + local vmess="vmess://$(cat /usr/local/etc/v2ray/vmess_qr.json | base64 -w 0)" echo echo "---------- V2Ray vmess URL / V2RayNG v0.4.1+ / V2RayN v2.1+ / 仅适合部分客户端 -------------" echo @@ -2281,7 +2281,7 @@ get_v2ray_vmess_URL_link() { echo echo -e "${yellow}免被墙..推荐使用JMS: ${cyan}https://getjms.com${none}" echo - rm -rf /etc/v2ray/vmess_qr.json + rm -rf /usr/local/etc/v2ray/vmess_qr.json } other() { while :; do @@ -2449,9 +2449,9 @@ update_v2ray() { } update_v2ray.sh() { if [[ $_test ]]; then - local latest_version=$(curl -H 'Cache-Control: no-cache' -s -L "https://raw.githubusercontent.com/233boy/v2ray/test/v2ray.sh" | grep '_version' -m1 | cut -d\" -f2) + local latest_version=$(curl -H 'Cache-Control: no-cache' -s -L "https://raw.githubusercontent.com/saga/v2ray/test/v2ray.sh" | grep '_version' -m1 | cut -d\" -f2) else - local latest_version=$(curl -H 'Cache-Control: no-cache' -s -L "https://raw.githubusercontent.com/233boy/v2ray/master/v2ray.sh" | grep '_version' -m1 | cut -d\" -f2) + local latest_version=$(curl -H 'Cache-Control: no-cache' -s -L "https://raw.githubusercontent.com/saga/v2ray/master/v2ray.sh" | grep '_version' -m1 | cut -d\" -f2) fi if [[ ! $latest_version ]]; then @@ -2473,9 +2473,9 @@ update_v2ray.sh() { echo echo -e " $green 咦...发现新版本耶....正在拼命更新.......$none" echo - cd /etc/v2ray/233boy/v2ray + cd /usr/local/etc/v2ray/sagasw/v2ray git pull - cp -f /etc/v2ray/233boy/v2ray/v2ray.sh $_v2ray_sh + cp -f /usr/local/etc/v2ray/sagasw/v2ray/v2ray.sh $_v2ray_sh chmod +x $_v2ray_sh echo echo -e "$green 更新成功啦...当前 V2Ray 管理脚本 版本: ${cyan}$latest_version$none" @@ -2677,7 +2677,7 @@ menu() { echo echo "帮助说明: https://233v2.com/post/1/" echo - echo "反馈问题: https://github.com/233boy/v2ray/issues" + echo "反馈问题: https://github.com/sagasw/v2ray/issues" echo echo "TG 频道: https://t.me/tg2333" echo