Skip to content

Commit

Permalink
Improve IsDestDir functionality with filesystem info
Browse files Browse the repository at this point in the history
Add a check for FileInfo to determine whether a given string is a
directory path. If any error occurs, fall back to the naive string
check.

Fixes #365
  • Loading branch information
Zetten committed Oct 11, 2018
1 parent 03db09e commit 073abff
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkg/util/command_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,14 @@ func matchSources(srcs, files []string) ([]string, error) {
}

func IsDestDir(path string) bool {
return strings.HasSuffix(path, "/") || path == "."
// try to stat the path
fileInfo, err := os.Stat(path)
if err != nil {
// fall back to string-based determination
return strings.HasSuffix(path, "/") || path == "."
}
// if it's a real path, check the fs response
return fileInfo.IsDir()
}

// DestinationFilepath returns the destination filepath from the build context to the image filesystem
Expand Down

0 comments on commit 073abff

Please sign in to comment.