Merge pull request #115 from kinekt4/dir-path-resolution

fabpot · web-flow · commit c1fef565488e · 2022-03-12T10:26:40.000+01:00
Evaluate symlinks when determining project directory
diff --git a/commands/root.go b/commands/root.go
@@ -198,11 +198,11 @@ func initConfig() {
 }
 
 func getProjectDir(dir string) (string, error) {
-	if dir != "" {
-		if filepath.IsAbs(dir) {
-			return dir, nil
-		}
-		return filepath.Abs(dir)
+
+	var err error
+	if dir, err = filepath.Abs(dir); err != nil {
+		return "", err
 	}
-	return os.Getwd()
+
+	return filepath.EvalSymlinks(dir)
 }

Original file line number	Diff line number	Diff line change
`@@ -198,11 +198,11 @@ func initConfig() {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`func getProjectDir(dir string) (string, error) {`
`201`		`- if dir != "" {`
`202`		`- if filepath.IsAbs(dir) {`
`203`		`- return dir, nil`
`204`		`- }`
`205`		`- return filepath.Abs(dir)`
	`201`	`+`
	`202`	`+ var err error`
	`203`	`+ if dir, err = filepath.Abs(dir); err != nil {`
	`204`	`+ return "", err`
`206`	`205`	`}`
`207`		`- return os.Getwd()`
	`206`	`+`
	`207`	`+ return filepath.EvalSymlinks(dir)`
`208`	`208`	`}`