From 2ad72d9ee3aafb2426b28a86b505da9d24f3e768 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 18 May 2017 12:25:20 +0200 Subject: [PATCH] Fix ResolveEnvVar when param is empty. Signed-off-by: Sebastien Douheret --- lib/common/filepath.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/common/filepath.go b/lib/common/filepath.go index 42ef82f..4c8c0da 100644 --- a/lib/common/filepath.go +++ b/lib/common/filepath.go @@ -24,9 +24,12 @@ func Exists(path string) bool { // ResolveEnvVar Resolved environment variable regarding the syntax ${MYVAR} // or $MYVAR following by a slash or a backslash func ResolveEnvVar(s string) (string, error) { + if s == "" { + return s, nil + } // Resolved tilde : ~/ - if s[:2] == "~/" { + if len(s) > 2 && s[:2] == "~/" { if usr, err := user.Current(); err == nil { s = filepath.Join(usr.HomeDir, s[2:]) } -- 2.16.6