Merge pull request #230 from ipfs/schomatis/fix/cli/parse/extract-dir-before-base

schomatis · web-flow · commit e9b38676e735 · 2022-04-15T12:55:25.000-03:00
fix(cli/parse): extract dir before name
diff --git a/cli/parse.go b/cli/parse.go
@@ -329,8 +329,8 @@ func parseArgs(req *cmds.Request, root *cmds.Command, stdin *os.File) error {
 						return err
 					}
 
-					fpath = filepath.Base(fpath)
 					importDir := filepath.Dir(fpath)
+					fpath = filepath.Base(fpath)
 					prevDir, ok := fileImportDirName[fpath]
 					if !ok {
 						fileImportDirName[fpath] = importDir
diff --git a/version.json b/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "v0.8.0"
+  "version": "v0.8.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,8 @@ func parseArgs(req cmds.Request, root cmds.Command, stdin *os.File) error {`
`329`	`329`	`return err`
`330`	`330`	`}`
`331`	`331`
`332`		`- fpath = filepath.Base(fpath)`
`333`	`332`	`importDir := filepath.Dir(fpath)`
	`333`	`+ fpath = filepath.Base(fpath)`
`334`	`334`	`prevDir, ok := fileImportDirName[fpath]`
`335`	`335`	`if !ok {`
`336`	`336`	`fileImportDirName[fpath] = importDir`