From f1f69bc6482f51ed6370aa0426410e1bbce2db51 Mon Sep 17 00:00:00 2001
From: Garry McNulty <garrmcnu@gmail.com>
Date: Fri, 20 Jul 2018 20:51:20 +0100
Subject: [PATCH] check: Use --cache-dir argument

Closes #1880
---
 changelog/unreleased/issue-1880 | 7 +++++++
 cmd/restic/cmd_check.go         | 6 ++++++
 2 files changed, 13 insertions(+)
 create mode 100644 changelog/unreleased/issue-1880

diff --git a/changelog/unreleased/issue-1880 b/changelog/unreleased/issue-1880
new file mode 100644
index 000000000..95180ae58
--- /dev/null
+++ b/changelog/unreleased/issue-1880
@@ -0,0 +1,7 @@
+Bugfix: Use `--cache-dir` argument for `check` command
+
+`check` command now uses a specific cache directory if set using the `--cache-dir` argument.
+
+The `--cache-dir` argument was not used by the `check` command, instead a cache directory was created in the temporary directory.
+
+https://github.com/restic/restic/issues/1880
diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go
index 33b5f3725..ac7be5d49 100644
--- a/cmd/restic/cmd_check.go
+++ b/cmd/restic/cmd_check.go
@@ -122,6 +122,7 @@ func newReadProgress(gopts GlobalOptions, todo restic.Stat) *restic.Progress {
 // prepareCheckCache configures a special cache directory for check.
 //
 //  * if --with-cache is specified, the default cache is used
+//  * if the user provides --cache-dir, the specified directory is used
 //  * if the user explicitly requested --no-cache, we don't use any cache
 //  * by default, we use a cache in a temporary directory that is deleted after the check
 func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func()) {
@@ -131,6 +132,11 @@ func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func())
 		return cleanup
 	}
 
+	if gopts.CacheDir != "" {
+		// use the specified cache directory, no setup needed
+		return cleanup
+	}
+
 	if gopts.NoCache {
 		// don't use any cache, no setup needed
 		return cleanup