Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 6fd2686

Browse files
committed
figuring out evocation pathway, cacheDir should be consistent between modules
1 parent e700f76 commit 6fd2686

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cmd/root.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var save bool
3939
var types diffTypes
4040
var noCache bool
4141

42+
var cacheDir string
4243
var LogLevel string
4344
var format string
4445

@@ -129,15 +130,18 @@ func getImage(imageName string) (pkgutil.Image, error) {
129130
var cachePath string
130131
var err error
131132
if !noCache {
132-
cachePath, err = cacheDir(imageName)
133+
cachePath, err = getCacheDir(imageName, cacheDir)
133134
if err != nil {
134135
return pkgutil.Image{}, err
135136
}
136137
}
137138
return pkgutil.GetImage(imageName, includeLayers(), cachePath)
138139
}
139140

140-
func cacheDir(imageName string) (string, error) {
141+
func getCacheDir(imageName string, cacheDir string) (string, error) {
142+
// If the user has specified a custom cache directory
143+
// TODO: write me
144+
// else
141145
dir, err := homedir.Dir()
142146
if err != nil {
143147
return "", err
@@ -185,4 +189,5 @@ func addSharedFlags(cmd *cobra.Command) {
185189
cmd.Flags().BoolVarP(&save, "save", "s", false, "Set this flag to save rather than remove the final image filesystems on exit.")
186190
cmd.Flags().BoolVarP(&util.SortSize, "order", "o", false, "Set this flag to sort any file/package results by descending size. Otherwise, they will be sorted by name.")
187191
cmd.Flags().BoolVarP(&noCache, "no-cache", "n", false, "Set this to force retrieval of image filesystem on each run.")
192+
cmd.Flags().StringVar(&cacheDir, "cache", "", "cache directory base to create .container-diff (default is $HOME).")
188193
}

0 commit comments

Comments
 (0)