Skip to content

Commit 19e5eef

Browse files
authored
Merge pull request #23 from github/fix-cachedir-trailing-slash
Fix an issue with trailing path separators in the `--cache-dir` argument.
2 parents e90c31b + 5804eab commit 19e5eef

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

internal/cachedirectory/cachedirectory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type CacheDirectory struct {
2525

2626
func NewCacheDirectory(path string) CacheDirectory {
2727
return CacheDirectory{
28-
path: path,
28+
path: filepath.Clean(path),
2929
}
3030
}
3131

internal/cachedirectory/cachedirectory_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,10 @@ func TestErrorIfPushNonExistent(t *testing.T) {
8181
err := cacheDirectory.CheckOrCreateVersionFile(false, aVersion)
8282
require.EqualError(t, err, errorPushNonCache)
8383
}
84+
85+
func TestCreateCacheDirectoryWithTrailingSlash(t *testing.T) {
86+
temporaryDirectory := test.CreateTemporaryDirectory(t)
87+
cacheDirectory := NewCacheDirectory(path.Join(temporaryDirectory, "cache") + string(os.PathSeparator))
88+
err := cacheDirectory.CheckOrCreateVersionFile(true, aVersion)
89+
require.NoError(t, err)
90+
}

0 commit comments

Comments
 (0)