diff options
| -rw-r--r-- | golib/filepath.go | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/golib/filepath.go b/golib/filepath.go index c91f63d..1817f58 100644 --- a/golib/filepath.go +++ b/golib/filepath.go @@ -55,18 +55,7 @@ func ResolveEnvVar(s string) (string, error) { val := "" if v[1] == "EXEPATH" { // Specific case to resolve $EXEPATH or ${EXEPATH} used as current executable path - exePath := os.Args[0] - ee, _ := os.Executable() - exeAbsPath, err := filepath.Abs(ee) - if err == nil { - exePath, err = filepath.EvalSymlinks(exeAbsPath) - if err == nil { - exePath = filepath.Dir(ee) - } else { - exePath = filepath.Dir(exeAbsPath) - } - } - val = exePath + val = GetExePath() } else { // Get env var value @@ -122,3 +111,19 @@ func GetUserHome() string { return "" } + +// GetExePath returns the full path of the current executable +func GetExePath() string { + exePath := os.Args[0] // set fallback value + ee, _ := os.Executable() + exeAbsPath, err := filepath.Abs(ee) + if err == nil { + exePath, err = filepath.EvalSymlinks(exeAbsPath) + if err == nil { + exePath = filepath.Dir(ee) + } else { + exePath = filepath.Dir(exeAbsPath) + } + } + return exePath +} |