🔥 Sync 2026-10-24 23:19:23

luci-app-passwall/root/usr/share/passwall/app.sh

@@ -640,8 +640,8 @@ start_global() {
 		}
 
 		[ "$protocol" = "_shunt" ] && {
-			local geoip_path="${V2RAY_LOCATION_ASSET%*/}/geoip.dat"
-			local geosite_path="${V2RAY_LOCATION_ASSET%*/}/geosite.dat"
+			local geoip_path="${GEO_DIR%/}/geoip.dat"
+			local geosite_path="${GEO_DIR%/}/geosite.dat"
 			if [ ! -s "$geoip_path" ] || [ ! -s "$geosite_path" ]; then
 				echolog "* 缺少Geo规则文件，TCP Sing-Box分流节点无法正常使用！"
 			fi
@@ -724,8 +724,8 @@ start_global() {
 		}
 
 		[ "$protocol" = "_shunt" ] && {
-			local geoip_path="${V2RAY_LOCATION_ASSET%*/}/geoip.dat"
-			local geosite_path="${V2RAY_LOCATION_ASSET%*/}/geosite.dat"
+			local geoip_path="${GEO_DIR%/}/geoip.dat"
+			local geosite_path="${GEO_DIR%/}/geosite.dat"
 			if [ ! -s "$geoip_path" ] || [ ! -s "$geosite_path" ]; then
 				echolog "* 缺少Geo规则文件，TCP Xray分流节点无法正常使用！"
 			fi
@@ -1718,8 +1718,14 @@ start() {
 	mkdir -p /tmp/etc /tmp/log $TMP_PATH $TMP_BIN_PATH $TMP_SCRIPT_FUNC_PATH $TMP_ROUTE_PATH $TMP_ACL_PATH $TMP_PATH2
 	set_cache_var "LOCAL_DNS" "$LOCAL_DNS"
 	get_config
-	export V2RAY_LOCATION_ASSET=$(config_n_get @global_rules[0] v2ray_location_asset "/usr/share/v2ray/")
-	export XRAY_LOCATION_ASSET=$V2RAY_LOCATION_ASSET
+	GEO_DIR=$(config_n_get @global_rules[0] v2ray_location_asset "/usr/share/v2ray/")
+	export XRAY_LOCATION_ASSET="$TMP_PATH2/geodata"
+	mkdir -p "$XRAY_LOCATION_ASSET" 2>/dev/null
+	local geo_file
+	for geo_file in "${GEO_DIR%/}"/*.dat; do
+		[ -f "$geo_file" ] || continue
+		ln -sf "$geo_file" "$XRAY_LOCATION_ASSET/${geo_file##*/}" 2>/dev/null
+	done
 	export ENABLE_DEPRECATED_GEOSITE=true
 	export ENABLE_DEPRECATED_GEOIP=true
 	export SS_SYSTEM_DNS_RESOLVER_FORCE_BUILTIN=1
@@ -1800,7 +1806,6 @@ stop() {
 	busybox pgrep -af "${CONFIG}/monitor\.sh" | xargs -r kill -9 >/dev/null 2>&1
 	busybox pgrep -f "sleep.*(6s|9s|58s)" | xargs -r kill -9 >/dev/null 2>&1
 	busybox pgrep -af "${CONFIG}/" | awk '! /app\.sh|subscribe\.lua|rule_update\.lua|tasks\.sh|server_app\.lua|ujail/{print $1}' | xargs -r kill -9 >/dev/null 2>&1
-	unset V2RAY_LOCATION_ASSET
 	unset XRAY_LOCATION_ASSET
 	unset SS_SYSTEM_DNS_RESOLVER_FORCE_BUILTIN
 	stop_crontab "$1"

luci-app-passwall/root/usr/share/passwall/iptables.sh

@@ -1597,6 +1597,7 @@ stop() {
 		rm -rf $TMP_PATH2/singbox*
 		rm -rf $TMP_PATH2/dnsmasq*
 		rm -rf $TMP_PATH2/geo_output
+		rm -rf $TMP_PATH2/geodata
 		rm -rf $TMP_PATH2/user_rules
 	}
 	flush_include

luci-app-passwall/root/usr/share/passwall/nftables.sh

@@ -1610,6 +1610,7 @@ stop() {
 		rm -rf $TMP_PATH2/singbox*
 		rm -rf $TMP_PATH2/dnsmasq*
 		rm -rf $TMP_PATH2/geo_output
+		rm -rf $TMP_PATH2/geodata
 		rm -rf $TMP_PATH2/user_rules
 	}
 	flush_include