WIP

matifali · matifali · commit 586e7cbafe5b · 2023-04-14T05:32:38.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -1406,20 +1406,13 @@ func expandDirectory(dir string) (string, error) {
 			return "", err
 		}
 		dir = filepath.Join(home, dir[1:])
-
-	} else if !filepath.IsAbs(dir) {
-		// If the directory is not absolute, we assume it is relative to the
-		// user's home directory.
+	}
+	if !filepath.IsAbs(dir) {
 		home, err := userHomeDir()
 		if err != nil {
 			return "", err
 		}
 		dir = filepath.Join(home, dir)
-
-	} else {
-		// If the directory is absolute, we assume it is an absolute path.
-		// We do not check if the directory exists.
-		return dir, nil
 	}
 	return os.ExpandEnv(dir), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1406,20 +1406,13 @@ func expandDirectory(dir string) (string, error) {`
`1406`	`1406`	`return "", err`
`1407`	`1407`	`}`
`1408`	`1408`	`dir = filepath.Join(home, dir[1:])`
`1409`		`-`
`1410`		`- } else if !filepath.IsAbs(dir) {`
`1411`		`- // If the directory is not absolute, we assume it is relative to the`
`1412`		`- // user's home directory.`
	`1409`	`+ }`
	`1410`	`+ if !filepath.IsAbs(dir) {`
`1413`	`1411`	`home, err := userHomeDir()`
`1414`	`1412`	`if err != nil {`
`1415`	`1413`	`return "", err`
`1416`	`1414`	`}`
`1417`	`1415`	`dir = filepath.Join(home, dir)`
`1418`		`-`
`1419`		`- } else {`
`1420`		`- // If the directory is absolute, we assume it is an absolute path.`
`1421`		`- // We do not check if the directory exists.`
`1422`		`- return dir, nil`
`1423`	`1416`	`}`
`1424`	`1417`	`return os.ExpandEnv(dir), nil`
`1425`	`1418`	`}`