mirror of https://github.com/mack-a/v2ray-agent
fix(脚本): 修改任意组合安装时安装后启动失败问题、sing-box订阅增加自动选择与手动切换、修改sing-box订阅dns报错问题
mack-a
parent
d5d3fb537d
commit
349473d79e
|
|
@ -9,7 +9,7 @@
|
|||
"external_controller": "127.0.0.1:9090",
|
||||
"external_ui": "metacubexd",
|
||||
"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"
|
||||
},
|
||||
"cache_file": {
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
"address": "https://1.1.1.1/dns-query",
|
||||
"address_resolver": "dns_resolver",
|
||||
"strategy": "ipv4_only",
|
||||
"detour": "select"
|
||||
"detour": "手动切换"
|
||||
},
|
||||
{
|
||||
"tag": "dns_direct",
|
||||
|
|
@ -94,9 +94,19 @@
|
|||
}
|
||||
],
|
||||
"outbounds": [
|
||||
{
|
||||
"type": "urltest",
|
||||
"tag": "自动选择",
|
||||
"outbounds": [
|
||||
],
|
||||
"url": "https://www.gstatic.com/generate_204",
|
||||
"interval": "3m",
|
||||
"tolerance": 50,
|
||||
"interrupt_exist_connections": false
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "全局代理",
|
||||
"tag": "手动切换",
|
||||
"outbounds": [
|
||||
]
|
||||
},
|
||||
|
|
@ -104,35 +114,40 @@
|
|||
"type": "selector",
|
||||
"tag": "Telegram",
|
||||
"outbounds": [
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "YouTube",
|
||||
"outbounds": [
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "netflix",
|
||||
"outbounds": [
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "OpenAI",
|
||||
"outbounds": [
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "Apple",
|
||||
"outbounds": [
|
||||
"全局代理",
|
||||
"手动切换",
|
||||
"自动选择",
|
||||
"direct"
|
||||
]
|
||||
},
|
||||
|
|
@ -140,14 +155,16 @@
|
|||
"type": "selector",
|
||||
"tag": "Google",
|
||||
"outbounds": [
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "selector",
|
||||
"tag": "Microsoft",
|
||||
"outbounds": [
|
||||
"全局代理",
|
||||
"手动切换",
|
||||
"自动选择",
|
||||
"direct"
|
||||
]
|
||||
},
|
||||
|
|
@ -155,7 +172,8 @@
|
|||
"type": "selector",
|
||||
"tag": "Github",
|
||||
"outbounds": [
|
||||
"全局代理",
|
||||
"手动切换",
|
||||
"自动选择",
|
||||
"direct"
|
||||
]
|
||||
},
|
||||
|
|
@ -164,7 +182,8 @@
|
|||
"tag": "本地直连",
|
||||
"outbounds": [
|
||||
"direct",
|
||||
"全局代理"
|
||||
"手动切换",
|
||||
"自动选择"
|
||||
],
|
||||
"default": "direct"
|
||||
},
|
||||
|
|
@ -322,7 +341,7 @@
|
|||
"rules": [
|
||||
{
|
||||
"clash_mode": "global",
|
||||
"outbound": "全局代理"
|
||||
"outbound": "手动切换"
|
||||
},
|
||||
{
|
||||
"clash_mode": "direct",
|
||||
|
|
@ -401,7 +420,7 @@
|
|||
},
|
||||
{
|
||||
"rule_set": "geosite-geolocation-!cn",
|
||||
"outbound": "全局代理"
|
||||
"outbound": "手动切换"
|
||||
},
|
||||
{
|
||||
"rule_set": [
|
||||
|
|
|
|||
13
install.sh
13
install.sh
|
|
@ -1809,7 +1809,7 @@ nginxBlog() {
|
|||
if [[ "${nginxBlogInstallStatus}" == "y" ]]; then
|
||||
rm -rf "${nginxStaticPath}"
|
||||
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
|
||||
rm -f "${nginxStaticPath}html${randomNum}.zip*"
|
||||
echoContent green " ---> 添加伪装站点成功"
|
||||
|
|
@ -5118,7 +5118,7 @@ updateNginxBlog() {
|
|||
if [[ "${selectInstallNginxBlogType}" =~ ^[1-9]$ ]]; then
|
||||
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
|
||||
rm -f "${nginxStaticPath}html${selectInstallNginxBlogType}.zip*"
|
||||
|
|
@ -7328,10 +7328,9 @@ customXrayInstall() {
|
|||
# selectCustomInstallType="${selectCustomInstallType},"
|
||||
# fi
|
||||
#
|
||||
# if [[ "${selectCustomInstallType:0:1}" != "," ]]; then
|
||||
# selectCustomInstallType=",${selectCustomInstallType},"
|
||||
# fi
|
||||
|
||||
if [[ "${selectCustomInstallType:0:1}" != "," ]]; then
|
||||
selectCustomInstallType=",${selectCustomInstallType},"
|
||||
fi
|
||||
if [[ "${selectCustomInstallType//,/}" =~ ^[0-7]+$ ]]; then
|
||||
unInstallSubscribe
|
||||
checkBTPanel
|
||||
|
|
@ -8711,7 +8710,7 @@ menu() {
|
|||
cd "$HOME" || exit
|
||||
echoContent red "\n=============================================================="
|
||||
echoContent green "作者：mack-a"
|
||||
echoContent green "当前版本：v3.2.22"
|
||||
echoContent green "当前版本：v3.2.23"
|
||||
echoContent green "Github：https://github.com/mack-a/v2ray-agent"
|
||||
echoContent green "描述：八合一共存脚本\c"
|
||||
showInstallStatus
|
||||
|
|
|
|||
Loading…
Reference in New Issue