M1rs3m/BFR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added conditional statement to check for custom subscription rules (if custom_rules_subs=true).

Browse Source
This commit is contained in:
renovate[bot]
2023-08-15 19:51:41 +07:00
parent 4347929087
commit 042a16f415
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
box/scripts/box.tool
View File

@@ -7,7 +7,7 @@ source /data/adb/box/settings.ini
# user agent
user_agent="box_for_root"
# whether use ghproxy to accelerate github download
use_ghproxy=true
use_ghproxy=false
# Restart the binary, after stopping and running again
restart_box() {
@@ -153,14 +153,16 @@ update_subs() {
"${yq_cmd}" '.proxies' "${update_file_name}" > "${clash_provide_config}"
"${yq_cmd}" -i '{"proxies": .}' "${clash_provide_config}"
if ${yq_cmd} '.rules' "${update_file_name}" >/dev/null 2>&1; then
"${yq_cmd}" '.rules' "${update_file_name}" > "${clash_provide_rules}"
"${yq_cmd}" -i '{"rules": .}' "${clash_provide_rules}"
if [ "${custom_rules_subs}" = "true" ]; then
if ${yq_cmd} '.rules' "${update_file_name}" >/dev/null 2>&1; then
"${yq_cmd}" -i 'del(.rules)' "${clash_config}"
cat "${clash_provide_rules}" >> "${clash_config}"
"${yq_cmd}" '.rules' "${update_file_name}" > "${clash_provide_rules}"
"${yq_cmd}" -i '{"rules": .}' "${clash_provide_rules}"
"${yq_cmd}" -i 'del(.rules)' "${clash_config}"
cat "${clash_provide_rules}" >> "${clash_config}"
fi
fi
log Info "subscription success"
log Info "Update subscription $(date +"%F %R")"
if [ -f "${update_file_name}.bak" ]; then

2
box/settings.ini
View File

@@ -94,6 +94,8 @@ clash_config="${box_dir}/clash/${name_clash_config}"
# clash subscription
name_provide_clash_config="subscription.yaml"
clash_provide_config="${box_dir}/clash/provide/${name_provide_clash_config}"
# support rules specified in subscriptions, This is useful when the subscription contains customized rules as well.
custom_rules_subs="false"
name_provide_clash_rules="rules.yaml"
clash_provide_rules="${box_dir}/clash/provide/${name_provide_clash_rules}"