diff --git a/install.sh b/install.sh index 1403b9a..2215ec5 100755 --- a/install.sh +++ b/install.sh @@ -24,6 +24,8 @@ ensure_required_commands init_layout ensure_dashboard_deploy_prerequisites +resolve_geo_assets + resolve_runtime_kernel resolve_yq resolve_subconverter diff --git a/scripts/core/common.sh b/scripts/core/common.sh index f016fb5..46f7dec 100644 --- a/scripts/core/common.sh +++ b/scripts/core/common.sh @@ -419,7 +419,8 @@ copy_bundled_asset() { for candidate in \ "$root/$category/$file" \ "$root/$category/$version/$file" \ - "$root/$file"; do + "$root/$file" \ + "$RESOURCE_DIR/$category/$file"; do [ -s "$candidate" ] || continue mkdir -p "$(dirname "$out")" diff --git a/scripts/core/runtime.sh b/scripts/core/runtime.sh index afdc4c9..f1ef115 100644 --- a/scripts/core/runtime.sh +++ b/scripts/core/runtime.sh @@ -5,6 +5,35 @@ source "${PROJECT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)}/scri # shellcheck source=scripts/core/config.sh source "${PROJECT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)}/scripts/core/config.sh" +GEO_ASSET_DOWNLOADS=( + "resources/geo/Country.mmdb https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country.mmdb" + "resources/geo/geoip.metadb https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb" + "resources/geo/GeoLite2-ASN.mmdb https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb" + "resources/geo/GeoIP.dat https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat" + "resources/geo/GeoSite.dat https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat" +) + +resolve_geo_assets() { + case "${CLASH_PREDOWNLOAD_GEO:-true}" in + 0|false|no|off|disable|disabled|FALSE|NO|OFF) return 0 ;; + esac + + [ -n "${PROJECT_DIR:-}" ] || return 0 + + local item path url file target + + for item in "${GEO_ASSET_DOWNLOADS[@]}"; do + path="${item%% *}" + url="${item#* }" + file="$(basename "$path")" + target="$RUNTIME_DIR/$file" + + if ! copy_bundled_asset "geo" "latest" "$file" "$target" "$file"; then + download_file "$url" "$target" "$file" + fi + done +} + resolve_yq() { local arch version file url tmp_dir tmp_file