From edda1a956ac4d3787350d5131ce4a3e80e004021 Mon Sep 17 00:00:00 2001
From: FIGBERT <figbert@figbert.com>
Date: Sat, 5 Aug 2023 21:28:27 -0700
Subject: [PATCH] Move directory logic to init backend

---
 initialize/dirs.go | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 main.go            | 88 +++-------------------------------------------
 2 files changed, 92 insertions(+), 84 deletions(-)
 create mode 100644 initialize/dirs.go

diff --git a/initialize/dirs.go b/initialize/dirs.go
new file mode 100644
index 0000000..3893a72
--- /dev/null
+++ b/initialize/dirs.go
@@ -0,0 +1,88 @@
+package initialize
+
+import (
+	"errors"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+)
+
+func getRootDir(subdir string) string {
+	rootDir := os.Getenv("GOMUKS_ROOT")
+	if rootDir == "" {
+		return ""
+	}
+	return filepath.Join(rootDir, subdir)
+}
+
+func UserCacheDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_CACHE_HOME")
+	if dir == "" {
+		dir = getRootDir("cache")
+	}
+	if dir == "" {
+		dir, err = os.UserCacheDir()
+		dir = filepath.Join(dir, "gomuks")
+	}
+	return
+}
+
+func UserDataDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_DATA_HOME")
+	if dir != "" {
+		return
+	}
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		return UserConfigDir()
+	}
+	dir = getRootDir("data")
+	if dir == "" {
+		dir = os.Getenv("XDG_DATA_HOME")
+	}
+	if dir == "" {
+		dir = os.Getenv("HOME")
+		if dir == "" {
+			return "", errors.New("neither $XDG_DATA_HOME nor $HOME are defined")
+		}
+		dir = filepath.Join(dir, ".local", "share")
+	}
+	dir = filepath.Join(dir, "gomuks")
+	return
+}
+
+func getXDGUserDir(name string) (dir string, err error) {
+	cmd := exec.Command("xdg-user-dir", name)
+	var out strings.Builder
+	cmd.Stdout = &out
+	err = cmd.Run()
+	dir = strings.TrimSpace(out.String())
+	return
+}
+
+func UserDownloadDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_DOWNLOAD_HOME")
+	if dir != "" {
+		return
+	}
+	dir, _ = getXDGUserDir("DOWNLOAD")
+	if dir != "" {
+		return
+	}
+	dir, err = os.UserHomeDir()
+	dir = filepath.Join(dir, "Downloads")
+	return
+}
+
+func UserConfigDir() (dir string, err error) {
+	dir = os.Getenv("GOMUKS_CONFIG_HOME")
+	if dir == "" {
+		dir = getRootDir("config")
+	}
+	if dir == "" {
+		dir, err = os.UserConfigDir()
+		dir = filepath.Join(dir, "gomuks")
+	}
+	return
+}
diff --git a/main.go b/main.go
index 51f2ff1..945f565 100644
--- a/main.go
+++ b/main.go
@@ -17,10 +17,8 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -130,22 +128,22 @@ func main() {
 
 	var configDir, dataDir, cacheDir, downloadDir string
 
-	configDir, err = UserConfigDir()
+	configDir, err = initialize.UserConfigDir()
 	if err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, "Failed to get config directory:", err)
 		os.Exit(3)
 	}
-	dataDir, err = UserDataDir()
+	dataDir, err = initialize.UserDataDir()
 	if err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, "Failed to get data directory:", err)
 		os.Exit(3)
 	}
-	cacheDir, err = UserCacheDir()
+	cacheDir, err = initialize.UserCacheDir()
 	if err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, "Failed to get cache directory:", err)
 		os.Exit(3)
 	}
-	downloadDir, err = UserDownloadDir()
+	downloadDir, err = initialize.UserDownloadDir()
 	if err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, "Failed to get download directory:", err)
 		os.Exit(3)
@@ -182,81 +180,3 @@ func main() {
 	fmt.Println("Unexpected exit by return from gmx.Start().")
 	os.Exit(2)
 }
-
-func getRootDir(subdir string) string {
-	rootDir := os.Getenv("GOMUKS_ROOT")
-	if rootDir == "" {
-		return ""
-	}
-	return filepath.Join(rootDir, subdir)
-}
-
-func UserCacheDir() (dir string, err error) {
-	dir = os.Getenv("GOMUKS_CACHE_HOME")
-	if dir == "" {
-		dir = getRootDir("cache")
-	}
-	if dir == "" {
-		dir, err = os.UserCacheDir()
-		dir = filepath.Join(dir, "gomuks")
-	}
-	return
-}
-
-func UserDataDir() (dir string, err error) {
-	dir = os.Getenv("GOMUKS_DATA_HOME")
-	if dir != "" {
-		return
-	}
-	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
-		return UserConfigDir()
-	}
-	dir = getRootDir("data")
-	if dir == "" {
-		dir = os.Getenv("XDG_DATA_HOME")
-	}
-	if dir == "" {
-		dir = os.Getenv("HOME")
-		if dir == "" {
-			return "", errors.New("neither $XDG_DATA_HOME nor $HOME are defined")
-		}
-		dir = filepath.Join(dir, ".local", "share")
-	}
-	dir = filepath.Join(dir, "gomuks")
-	return
-}
-
-func getXDGUserDir(name string) (dir string, err error) {
-	cmd := exec.Command("xdg-user-dir", name)
-	var out strings.Builder
-	cmd.Stdout = &out
-	err = cmd.Run()
-	dir = strings.TrimSpace(out.String())
-	return
-}
-
-func UserDownloadDir() (dir string, err error) {
-	dir = os.Getenv("GOMUKS_DOWNLOAD_HOME")
-	if dir != "" {
-		return
-	}
-	dir, _ = getXDGUserDir("DOWNLOAD")
-	if dir != "" {
-		return
-	}
-	dir, err = os.UserHomeDir()
-	dir = filepath.Join(dir, "Downloads")
-	return
-}
-
-func UserConfigDir() (dir string, err error) {
-	dir = os.Getenv("GOMUKS_CONFIG_HOME")
-	if dir == "" {
-		dir = getRootDir("config")
-	}
-	if dir == "" {
-		dir, err = os.UserConfigDir()
-		dir = filepath.Join(dir, "gomuks")
-	}
-	return
-}