lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-03 19:19:08 -04:00
Code Issues Releases Wiki Activity

Fix: v2ray.location.asset env not working (#889)

Browse Source
This commit is contained in:
Loyalsoldier
2021-04-12 10:01:30 +08:00
committed by GitHub
parent 098bf4bc21
commit 7790d33185
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/router/condition_test.go
View File

@@ -2,6 +2,7 @@ package router_test
import (
"errors"
"io/fs"
"os"
"path/filepath"
"strconv"
@@ -32,8 +33,8 @@ func init() {
os.Setenv("v2ray.location.asset", tempPath)
if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, os.ErrNotExist) {
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, os.ErrNotExist) {
if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755))
geoipBytes, err := common.FetchHTTPContent(geoipURL)
common.Must(err)
@@ -41,8 +42,8 @@ func init() {
}
}
if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, os.ErrNotExist) {
if _, err := os.Stat(geositePath); err != nil && errors.Is(err, os.ErrNotExist) {
if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755))
geositeBytes, err := common.FetchHTTPContent(geositeURL)
common.Must(err)