From ce0d252014603dd35a577112c113355d19780307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:47:21 +0800 Subject: [PATCH 01/10] Update sb.sh --- sb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sb.sh b/sb.sh index 73bd8a6..35a34e4 100644 --- a/sb.sh +++ b/sb.sh @@ -1102,10 +1102,10 @@ hy2_link="hysteria2://$uuid@$sb_hy2_ip:$hy2_port?security=tls&alpn=h3&insecure=$ echo "$hy2_link" > /etc/s-box/hy2.txt red "🚀【 Hysteria-2 】节点信息如下:" && sleep 2 echo -echo "分享链接【v2rayn、nekobox、小火箭shadowrocket】" +echo "分享链接【v2rayn、v2rayng、nekobox、小火箭shadowrocket】" echo -e "${yellow}$hy2_link${plain}" echo -echo "二维码【v2rayn、nekobox、小火箭shadowrocket】" +echo "二维码【v2rayn、v2rayng、nekobox、小火箭shadowrocket】" qrencode -o - -t ANSIUTF8 "$(cat /etc/s-box/hy2.txt)" white "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo From 0644a815927be2fb6a70e7a6bf0fe260cdc3a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:26:27 +0800 Subject: [PATCH 02/10] Update sb.sh --- sb.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sb.sh b/sb.sh index 35a34e4..1e812ab 100644 --- a/sb.sh +++ b/sb.sh @@ -905,7 +905,7 @@ fi } ipuuid(){ -uuid=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].users[0].uuid') +uuid=$(sed 's://.*::g' /etc/s-box/sb.json 2>/dev/null | jq -r '.inbounds[0].users[0].uuid') serip=$(curl -s4m5 icanhazip.com -k || curl -s6m5 icanhazip.com -k) if [[ "$serip" =~ : ]]; then sbdnsip='tls://[2001:4860:4860::8888]/dns-query' @@ -916,6 +916,28 @@ sbdnsip='tls://8.8.8.8/dns-query' server_ip="$serip" server_ipcl="$serip" fi +if [[ -f '/etc/systemd/system/sing-box.service' ]]; then +v4v6 +if [[ -n $v4 && -n $v6 ]]; then +green "VPS为双栈VPS,可切换IPV4或IPV6配置输出" +yellow "1:使用IPV4:$v4 配置输出 (回车默认)" +yellow "2:使用IPV6:$v6 配置输出" +readp "请选择【1-2】:" menu +if [ -z "$menu" ] || [ "$menu" = "1" ] ; then +sbdnsip='tls://8.8.8.8/dns-query' +server_ip="$v4" +server_ipcl="$v4" +else +sbdnsip='tls://[2001:4860:4860::8888]/dns-query' +server_ip="[$v6]" +server_ipcl="$v6" +fi +else +yellow "VPS并不是双栈VPS,不支持配置输出的切换" +fi +else +red "未安装Sing-box服务" && exit +fi } wgcfgo(){ From ef7fc80033240c6fa95a0aa40e7aaf004b22ae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:00:26 +0800 Subject: [PATCH 03/10] Update sb.sh --- sb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sb.sh b/sb.sh index 1e812ab..825a9dc 100644 --- a/sb.sh +++ b/sb.sh @@ -919,7 +919,7 @@ fi if [[ -f '/etc/systemd/system/sing-box.service' ]]; then v4v6 if [[ -n $v4 && -n $v6 ]]; then -green "VPS为双栈VPS,可切换IPV4或IPV6配置输出" +green "关TLS或使用自签证书的节点,可切换IPV4或IPV6配置输出" yellow "1:使用IPV4:$v4 配置输出 (回车默认)" yellow "2:使用IPV6:$v6 配置输出" readp "请选择【1-2】:" menu From cae97a9a027531e25a6745ded99beefa111efbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:00:21 +0800 Subject: [PATCH 04/10] Update sb.sh --- sb.sh | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/sb.sh b/sb.sh index 825a9dc..fd2b162 100644 --- a/sb.sh +++ b/sb.sh @@ -905,35 +905,45 @@ fi } ipuuid(){ -uuid=$(sed 's://.*::g' /etc/s-box/sb.json 2>/dev/null | jq -r '.inbounds[0].users[0].uuid') -serip=$(curl -s4m5 icanhazip.com -k || curl -s6m5 icanhazip.com -k) -if [[ "$serip" =~ : ]]; then -sbdnsip='tls://[2001:4860:4860::8888]/dns-query' -server_ip="[$serip]" -server_ipcl="$serip" -else -sbdnsip='tls://8.8.8.8/dns-query' -server_ip="$serip" -server_ipcl="$serip" -fi if [[ -f '/etc/systemd/system/sing-box.service' ]]; then v4v6 if [[ -n $v4 && -n $v6 ]]; then -green "关TLS或使用自签证书的节点,可切换IPV4或IPV6配置输出" -yellow "1:使用IPV4:$v4 配置输出 (回车默认)" -yellow "2:使用IPV6:$v6 配置输出" +green "选择配置输出" +yellow "1:使用IPV4配置输出 (回车默认) " +yellow "2:使用IPV6配置输出" readp "请选择【1-2】:" menu -if [ -z "$menu" ] || [ "$menu" = "1" ] ; then +if [ -z "$menu" ] || [ "$menu" = "1" ]; then sbdnsip='tls://8.8.8.8/dns-query' +echo "sbdnsip" > /etc/s-box/sbdnsip.log server_ip="$v4" +echo "server_ip" > /etc/s-box/server_ip.log server_ipcl="$v4" +echo "server_ipcl" > /etc/s-box/server_ipcl.log else sbdnsip='tls://[2001:4860:4860::8888]/dns-query' +echo "sbdnsip" > /etc/s-box/sbdnsip.log server_ip="[$v6]" +echo "server_ip" > /etc/s-box/server_ip.log server_ipcl="$v6" fi else yellow "VPS并不是双栈VPS,不支持配置输出的切换" +serip=$(curl -s4m5 icanhazip.com -k || curl -s6m5 icanhazip.com -k) +if [[ "$serip" =~ : ]]; then +sbdnsip='tls://[2001:4860:4860::8888]/dns-query' +echo "sbdnsip" > /etc/s-box/sbdnsip.log +server_ip="[$serip]" +echo "server_ip" > /etc/s-box/server_ip.log +server_ipcl="$serip" +echo "server_ipcl" > /etc/s-box/server_ipcl.log +else +sbdnsip='tls://8.8.8.8/dns-query' +echo "sbdnsip" > /etc/s-box/sbdnsip.log +server_ip="$serip" +echo "server_ip" > /etc/s-box/server_ip.log +server_ipcl="$serip" +echo "server_ipcl" > /etc/s-box/server_ipcl.log +fi fi else red "未安装Sing-box服务" && exit @@ -961,7 +971,10 @@ ym=`bash ~/.acme.sh/acme.sh --list | tail -1 | awk '{print $1}'` echo $ym > /root/ygkkkca/ca.log fi rm -rf /etc/s-box/vm_ws_argo.txt /etc/s-box/vm_ws.txt /etc/s-box/vm_ws_tls.txt -wgcfgo +sbdnsip=$(/etc/s-box/sbdnsip.log) +server_ip=$(/etc/s-box/server_ip.log) +server_ipcl=$(/etc/s-box/server_ipcl.log) +uuid=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].users[0].uuid') vl_port=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].listen_port') vl_name=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].tls.server_name') public_key=$(cat /etc/s-box/public.key) @@ -3410,6 +3423,7 @@ curl -sL https://raw.githubusercontent.com/yonggekkk/sing-box-yg/main/version | clear red "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" lnsb && blue "Sing-box-yg脚本安装成功,脚本快捷方式:sb" && cronsb && sleep 1 +wgcfgo sbshare red "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" blue "Hysteria2/Tuic5自定义V2rayN配置、Clash-Meta/Sing-box客户端配置及私有订阅链接,请选择9查看" From a9994918f90e50afbadc687570d8dbdfcbb7902a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:26:12 +0800 Subject: [PATCH 05/10] Update sb.sh --- sb.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sb.sh b/sb.sh index fd2b162..c764eb6 100644 --- a/sb.sh +++ b/sb.sh @@ -908,7 +908,7 @@ ipuuid(){ if [[ -f '/etc/systemd/system/sing-box.service' ]]; then v4v6 if [[ -n $v4 && -n $v6 ]]; then -green "选择配置输出" +green "双栈VPS需要选择IP配置输出,一般情况下nat vps建议选择IPV6" yellow "1:使用IPV4配置输出 (回车默认) " yellow "2:使用IPV6配置输出" readp "请选择【1-2】:" menu @@ -927,7 +927,7 @@ echo "server_ip" > /etc/s-box/server_ip.log server_ipcl="$v6" fi else -yellow "VPS并不是双栈VPS,不支持配置输出的切换" +yellow "VPS并不是双栈VPS,不支持IP配置输出的切换" serip=$(curl -s4m5 icanhazip.com -k || curl -s6m5 icanhazip.com -k) if [[ "$serip" =~ : ]]; then sbdnsip='tls://[2001:4860:4860::8888]/dns-query' @@ -5096,6 +5096,7 @@ green "11. 一键原版BBR+FQ加速" green "12. 管理 Acme 申请域名证书" green "13. 管理 Warp 查看Netflix/ChatGPT解锁情况" green "14. 添加 WARP-plus-Socks5 代理模式 【本地Warp/多地区Psiphon-VPN】" +green "15. 双栈VPS切换IPV4/IPV4配置输出" green " 0. 退出脚本" red "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" insV=$(cat /etc/s-box/v 2>/dev/null) @@ -5219,5 +5220,6 @@ case "$Input" in 12 ) acme;; 13 ) cfwarp;; 14 ) inssbwpph;; +15 ) wgcfgo && sbshare;; * ) exit esac From 69a9f4e104ea408631967d23995770a3e450da94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:35:32 +0800 Subject: [PATCH 06/10] Update sb.sh --- sb.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sb.sh b/sb.sh index c764eb6..39bfdf7 100644 --- a/sb.sh +++ b/sb.sh @@ -905,7 +905,14 @@ fi } ipuuid(){ -if [[ -f '/etc/systemd/system/sing-box.service' ]]; then +if [[ x"${release}" == x"alpine" ]]; then +status_cmd="rc-service sing-box status" +status_pattern="started" +else +status_cmd="systemctl status sing-box" +status_pattern="active" +fi +if [[ -n $($status_cmd 2>/dev/null | grep -w "$status_pattern") && -f '/etc/s-box/sb.json' ]]; then v4v6 if [[ -n $v4 && -n $v6 ]]; then green "双栈VPS需要选择IP配置输出,一般情况下nat vps建议选择IPV6" @@ -946,7 +953,7 @@ echo "server_ipcl" > /etc/s-box/server_ipcl.log fi fi else -red "未安装Sing-box服务" && exit +red "Sing-box服务未运行" && exit fi } From 3a5d08d6a209cd2cc6d843458cc8823155186679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:41:02 +0800 Subject: [PATCH 07/10] Update sb.sh --- sb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sb.sh b/sb.sh index 39bfdf7..0b5f440 100644 --- a/sb.sh +++ b/sb.sh @@ -71,7 +71,7 @@ if [ ! -f sbyg_update ]; then green "首次安装Sing-box-yg脚本必要的依赖……" if [[ x"${release}" == x"alpine" ]]; then apk update -apk add wget curl tar jq tzdata openssl expect git socat iproute2 iptables +apk add wget curl tar jq tzdata openssl expect git socat iproute2 iptables grep apk add virt-what apk add qrencode else From ad1a0e79fee347508c7042d2f478a56adfe01f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:44:50 +0800 Subject: [PATCH 08/10] Update sb.sh --- sb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sb.sh b/sb.sh index 0b5f440..e8bcb8c 100644 --- a/sb.sh +++ b/sb.sh @@ -978,9 +978,9 @@ ym=`bash ~/.acme.sh/acme.sh --list | tail -1 | awk '{print $1}'` echo $ym > /root/ygkkkca/ca.log fi rm -rf /etc/s-box/vm_ws_argo.txt /etc/s-box/vm_ws.txt /etc/s-box/vm_ws_tls.txt -sbdnsip=$(/etc/s-box/sbdnsip.log) -server_ip=$(/etc/s-box/server_ip.log) -server_ipcl=$(/etc/s-box/server_ipcl.log) +sbdnsip=$(cat /etc/s-box/sbdnsip.log) +server_ip=$(cat /etc/s-box/server_ip.log) +server_ipcl=$(cat /etc/s-box/server_ipcl.log) uuid=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].users[0].uuid') vl_port=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].listen_port') vl_name=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].tls.server_name') From 32f89bbe55ba760f50fdc3b92020275bff7d2cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:50:23 +0800 Subject: [PATCH 09/10] Update sb.sh --- sb.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sb.sh b/sb.sh index e8bcb8c..eeb9ea7 100644 --- a/sb.sh +++ b/sb.sh @@ -921,35 +921,36 @@ yellow "2:使用IPV6配置输出" readp "请选择【1-2】:" menu if [ -z "$menu" ] || [ "$menu" = "1" ]; then sbdnsip='tls://8.8.8.8/dns-query' -echo "sbdnsip" > /etc/s-box/sbdnsip.log +echo "$sbdnsip" > /etc/s-box/sbdnsip.log server_ip="$v4" -echo "server_ip" > /etc/s-box/server_ip.log +echo "$server_ip" > /etc/s-box/server_ip.log server_ipcl="$v4" -echo "server_ipcl" > /etc/s-box/server_ipcl.log +echo "$server_ipcl" > /etc/s-box/server_ipcl.log else sbdnsip='tls://[2001:4860:4860::8888]/dns-query' -echo "sbdnsip" > /etc/s-box/sbdnsip.log +echo "$sbdnsip" > /etc/s-box/sbdnsip.log server_ip="[$v6]" -echo "server_ip" > /etc/s-box/server_ip.log +echo "$server_ip" > /etc/s-box/server_ip.log server_ipcl="$v6" +echo "$server_ipcl" > /etc/s-box/server_ipcl.log fi else yellow "VPS并不是双栈VPS,不支持IP配置输出的切换" serip=$(curl -s4m5 icanhazip.com -k || curl -s6m5 icanhazip.com -k) if [[ "$serip" =~ : ]]; then sbdnsip='tls://[2001:4860:4860::8888]/dns-query' -echo "sbdnsip" > /etc/s-box/sbdnsip.log +echo "$sbdnsip" > /etc/s-box/sbdnsip.log server_ip="[$serip]" -echo "server_ip" > /etc/s-box/server_ip.log +echo "$server_ip" > /etc/s-box/server_ip.log server_ipcl="$serip" -echo "server_ipcl" > /etc/s-box/server_ipcl.log +echo "$server_ipcl" > /etc/s-box/server_ipcl.log else sbdnsip='tls://8.8.8.8/dns-query' -echo "sbdnsip" > /etc/s-box/sbdnsip.log +echo "$sbdnsip" > /etc/s-box/sbdnsip.log server_ip="$serip" -echo "server_ip" > /etc/s-box/server_ip.log +echo "$server_ip" > /etc/s-box/server_ip.log server_ipcl="$serip" -echo "server_ipcl" > /etc/s-box/server_ipcl.log +echo "$server_ipcl" > /etc/s-box/server_ipcl.log fi fi else From 43532ea24920c0731329ed439d261d27c7e104cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:56:14 +0800 Subject: [PATCH 10/10] Update sb.sh --- sb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sb.sh b/sb.sh index eeb9ea7..2d64075 100644 --- a/sb.sh +++ b/sb.sh @@ -5212,7 +5212,7 @@ showprotocol fi red "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo -readp "请输入数字【0-14】:" Input +readp "请输入数字【0-15】:" Input case "$Input" in 1 ) instsllsingbox;; 2 ) unins;;