From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Thu, 18 May 2017 10:25:20 +0000 (+0200)
Subject: Fix ResolveEnvVar when param is empty.
X-Git-Tag: v0.0.1-alpha~25
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2ad72d9ee3aafb2426b28a86b505da9d24f3e768;hp=199bec04165a8bd8d52034963725a2c6161814af;p=src%2Fxds%2Fxds-server.git

Fix ResolveEnvVar when param is empty.

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---

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:])
 		}