add asset location search

v2fly · Aug 17, 2020 · bc00811 · bc00811
1 parent 0c72d72
commit bc00811
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/common/platform/others.go b/common/platform/others.go
@@ -20,3 +20,25 @@ func GetToolLocation(file string) string {
 	toolPath := EnvFlag{Name: name, AltName: NormalizeEnvName(name)}.GetValue(getExecutableDir)
 	return filepath.Join(toolPath, file)
 }
+
+// GetAssetLocation search for `file` in certain locations
+func GetAssetLocation(file string) string {
+	const name = "v2ray.location.asset"
+	assetPath := NewEnvFlag(name).GetValue(getExecutableDir)
+	defPath := filepath.Join(assetPath, file)
+	for _, p := range []string{
+		defPath,
+		filepath.Join("/usr/local/share/v2ray/", file),
+		filepath.Join("/usr/share/v2ray/", file),
+	} {
+		if _, err := os.Stat(p); os.IsNotExist(err) {
+			continue
+		}
+
+		// asset found
+		return p
+	}
+
+	// asset not found, let the caller throw out the error
+	return defPath
+}
diff --git a/common/platform/platform.go b/common/platform/platform.go
@@ -66,12 +66,6 @@ func getExecutableSubDir(dir string) func() string {
 	}
 }
 
-func GetAssetLocation(file string) string {
-	const name = "v2ray.location.asset"
-	assetPath := NewEnvFlag(name).GetValue(getExecutableDir)
-	return filepath.Join(assetPath, file)
-}
-
 func GetPluginDirectory() string {
 	const name = "v2ray.location.plugin"
 	pluginDir := NewEnvFlag(name).GetValue(getExecutableSubDir("plugins"))

diff --git a/common/platform/windows.go b/common/platform/windows.go
@@ -18,3 +18,10 @@ func GetToolLocation(file string) string {
 	toolPath := EnvFlag{Name: name, AltName: NormalizeEnvName(name)}.GetValue(getExecutableDir)
 	return filepath.Join(toolPath, file+".exe")
 }
+
+// GetAssetLocation search for `file` in the excutable dir
+func GetAssetLocation(file string) string {
+	const name = "v2ray.location.asset"
+	assetPath := NewEnvFlag(name).GetValue(getExecutableDir)
+	return filepath.Join(assetPath, file)
+}