From 81659ae791d1bbf7c334dfc0e332c738070be98f Mon Sep 17 00:00:00 2001
From: Andrew Ayer <andrew@sslmate.com>
Date: Fri, 19 Sep 2025 22:23:35 -0400
Subject: [PATCH] Move some code for greater clarity

---
 cmd/certspotter/main.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmd/certspotter/main.go b/cmd/certspotter/main.go
index 4391a6f..63604df 100644
--- a/cmd/certspotter/main.go
+++ b/cmd/certspotter/main.go
@@ -56,6 +56,13 @@ func homedir() string {
 	}
 	return homedir
 }
+func userCacheDir() string {
+	userCacheDir, err := os.UserCacheDir()
+	if err != nil {
+		panic(fmt.Errorf("unable to determine user cache directory: %w", err))
+	}
+	return userCacheDir
+}
 func startedBySupervisor() bool {
 	return os.Getenv("SYSTEMD_EXEC_PID") == strconv.Itoa(os.Getpid())
 }
@@ -82,12 +89,9 @@ func defaultCacheDir() string {
 		return envVar
 	} else if envVar := os.Getenv("CACHE_DIRECTORY"); envVar != "" && startedBySupervisor() {
 		return envVar
+	} else {
+		return filepath.Join(userCacheDir(), "certspotter")
 	}
-	userCacheDir, err := os.UserCacheDir()
-	if err != nil {
-		panic(fmt.Errorf("unable to determine user cache directory: %w", err))
-	}
-	return filepath.Join(userCacheDir, "certspotter")
 }
 func defaultWatchListPath() string {
 	return filepath.Join(defaultConfigDir(), "watchlist")