fix #1309: locate plugin file upward recursively until system root dir

This commit is contained in:
debugtalk
2022-05-23 14:43:14 +08:00
parent 63a2dff53b
commit 10653b2843
2 changed files with 7 additions and 9 deletions

View File

@@ -1,9 +1,13 @@
# Release History
## v4.1.0 (2022-05-22)
## v4.1.0 (2022-05-23)
- feat: add `wiki` sub-command to open httprunner website
**go version**
- fix #1309: locate plugin file upward recursively until system root dir
## v4.1.0-beta (2022-05-21)
- feat: add pre-commit-hook to format go/python code

View File

@@ -78,11 +78,11 @@ func locatePlugin(path string) (pluginPath string, err error) {
return
}
log.Warn().Err(err).Str("path", path).Msg("plugin file not found")
return "", fmt.Errorf("plugin file not found")
}
// locateFile searches destFile upward recursively until current
// working directory or system root dir.
// locateFile searches destFile upward recursively until system root dir
func locateFile(startPath string, destFile string) (string, error) {
stat, err := os.Stat(startPath)
if os.IsNotExist(err) {
@@ -103,12 +103,6 @@ func locateFile(startPath string, destFile string) (string, error) {
return pluginPath, nil
}
// current working directory
cwd, _ := os.Getwd()
if startDir == cwd {
return "", fmt.Errorf("searched to CWD, plugin file not found")
}
// system root dir
parentDir, _ := filepath.Abs(filepath.Dir(startDir))
if parentDir == startDir {