fix(脚本): 修改任意组合安装时安装后启动失败问题、sing-box订阅增加自动选择与手动切换、修改sing-box订阅dns报错问题

pull/1006/head
mack-a 2024-03-14 14:57:42 +08:00
parent d5d3fb537d
commit 349473d79e
2 changed files with 39 additions and 21 deletions

View File

@ -9,7 +9,7 @@
"external_controller": "127.0.0.1:9090", "external_controller": "127.0.0.1:9090",
"external_ui": "metacubexd", "external_ui": "metacubexd",
"external_ui_download_url": "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip", "external_ui_download_url": "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip",
"external_ui_download_detour": "全局代理", "external_ui_download_detour": "手动切换",
"default_mode": "rule" "default_mode": "rule"
}, },
"cache_file": { "cache_file": {
@ -23,7 +23,7 @@
"address": "https://1.1.1.1/dns-query", "address": "https://1.1.1.1/dns-query",
"address_resolver": "dns_resolver", "address_resolver": "dns_resolver",
"strategy": "ipv4_only", "strategy": "ipv4_only",
"detour": "select" "detour": "手动切换"
}, },
{ {
"tag": "dns_direct", "tag": "dns_direct",
@ -94,9 +94,19 @@
} }
], ],
"outbounds": [ "outbounds": [
{
"type": "urltest",
"tag": "自动选择",
"outbounds": [
],
"url": "https://www.gstatic.com/generate_204",
"interval": "3m",
"tolerance": 50,
"interrupt_exist_connections": false
},
{ {
"type": "selector", "type": "selector",
"tag": "全局代理", "tag": "手动切换",
"outbounds": [ "outbounds": [
] ]
}, },
@ -104,35 +114,40 @@
"type": "selector", "type": "selector",
"tag": "Telegram", "tag": "Telegram",
"outbounds": [ "outbounds": [
"全局代理" "手动切换",
"自动选择"
] ]
}, },
{ {
"type": "selector", "type": "selector",
"tag": "YouTube", "tag": "YouTube",
"outbounds": [ "outbounds": [
"全局代理" "手动切换",
"自动选择"
] ]
}, },
{ {
"type": "selector", "type": "selector",
"tag": "netflix", "tag": "netflix",
"outbounds": [ "outbounds": [
"全局代理" "手动切换",
"自动选择"
] ]
}, },
{ {
"type": "selector", "type": "selector",
"tag": "OpenAI", "tag": "OpenAI",
"outbounds": [ "outbounds": [
"全局代理" "手动切换",
"自动选择"
] ]
}, },
{ {
"type": "selector", "type": "selector",
"tag": "Apple", "tag": "Apple",
"outbounds": [ "outbounds": [
"全局代理", "手动切换",
"自动选择",
"direct" "direct"
] ]
}, },
@ -140,14 +155,16 @@
"type": "selector", "type": "selector",
"tag": "Google", "tag": "Google",
"outbounds": [ "outbounds": [
"全局代理" "手动切换",
"自动选择"
] ]
}, },
{ {
"type": "selector", "type": "selector",
"tag": "Microsoft", "tag": "Microsoft",
"outbounds": [ "outbounds": [
"全局代理", "手动切换",
"自动选择",
"direct" "direct"
] ]
}, },
@ -155,7 +172,8 @@
"type": "selector", "type": "selector",
"tag": "Github", "tag": "Github",
"outbounds": [ "outbounds": [
"全局代理", "手动切换",
"自动选择",
"direct" "direct"
] ]
}, },
@ -164,7 +182,8 @@
"tag": "本地直连", "tag": "本地直连",
"outbounds": [ "outbounds": [
"direct", "direct",
"全局代理" "手动切换",
"自动选择"
], ],
"default": "direct" "default": "direct"
}, },
@ -322,7 +341,7 @@
"rules": [ "rules": [
{ {
"clash_mode": "global", "clash_mode": "global",
"outbound": "全局代理" "outbound": "手动切换"
}, },
{ {
"clash_mode": "direct", "clash_mode": "direct",
@ -401,7 +420,7 @@
}, },
{ {
"rule_set": "geosite-geolocation-!cn", "rule_set": "geosite-geolocation-!cn",
"outbound": "全局代理" "outbound": "手动切换"
}, },
{ {
"rule_set": [ "rule_set": [

View File

@ -1809,7 +1809,7 @@ nginxBlog() {
if [[ "${nginxBlogInstallStatus}" == "y" ]]; then if [[ "${nginxBlogInstallStatus}" == "y" ]]; then
rm -rf "${nginxStaticPath}" rm -rf "${nginxStaticPath}"
randomNum=$((RANDOM % 6 + 1)) randomNum=$((RANDOM % 6 + 1))
wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${randomNum}.zip >/dev/null wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${randomNum}.zip
unzip -o "${nginxStaticPath}html${randomNum}.zip" -d "${nginxStaticPath}" >/dev/null unzip -o "${nginxStaticPath}html${randomNum}.zip" -d "${nginxStaticPath}" >/dev/null
rm -f "${nginxStaticPath}html${randomNum}.zip*" rm -f "${nginxStaticPath}html${randomNum}.zip*"
echoContent green " ---> 添加伪装站点成功" echoContent green " ---> 添加伪装站点成功"
@ -5118,7 +5118,7 @@ updateNginxBlog() {
if [[ "${selectInstallNginxBlogType}" =~ ^[1-9]$ ]]; then if [[ "${selectInstallNginxBlogType}" =~ ^[1-9]$ ]]; then
rm -rf "${nginxStaticPath}" rm -rf "${nginxStaticPath}"
wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" >/dev/null wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip"
unzip -o "${nginxStaticPath}html${selectInstallNginxBlogType}.zip" -d "${nginxStaticPath}" >/dev/null unzip -o "${nginxStaticPath}html${selectInstallNginxBlogType}.zip" -d "${nginxStaticPath}" >/dev/null
rm -f "${nginxStaticPath}html${selectInstallNginxBlogType}.zip*" rm -f "${nginxStaticPath}html${selectInstallNginxBlogType}.zip*"
@ -7328,10 +7328,9 @@ customXrayInstall() {
# selectCustomInstallType="${selectCustomInstallType}," # selectCustomInstallType="${selectCustomInstallType},"
# fi # fi
# #
# if [[ "${selectCustomInstallType:0:1}" != "," ]]; then if [[ "${selectCustomInstallType:0:1}" != "," ]]; then
# selectCustomInstallType=",${selectCustomInstallType}," selectCustomInstallType=",${selectCustomInstallType},"
# fi fi
if [[ "${selectCustomInstallType//,/}" =~ ^[0-7]+$ ]]; then if [[ "${selectCustomInstallType//,/}" =~ ^[0-7]+$ ]]; then
unInstallSubscribe unInstallSubscribe
checkBTPanel checkBTPanel
@ -8711,7 +8710,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者mack-a" echoContent green "作者mack-a"
echoContent green "当前版本v3.2.22" echoContent green "当前版本v3.2.23"
echoContent green "Githubhttps://github.com/mack-a/v2ray-agent" echoContent green "Githubhttps://github.com/mack-a/v2ray-agent"
echoContent green "描述:八合一共存脚本\c" echoContent green "描述:八合一共存脚本\c"
showInstallStatus showInstallStatus