Extract final part of the appdir into a global variable for potential

re-use RELEASE_NOTES=n/a Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
gopasspw · Aug 18, 2021 · 12bc3d0 · 12bc3d0
1 parent a4e2a77
commit 12bc3d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/pkg/appdir/appdir.go b/pkg/appdir/appdir.go
@@ -9,6 +9,11 @@ import (
 	"github.com/gopasspw/gopass/pkg/debug"
 )
 
+var (
+	// Name is used in the final path of the generated path
+	Name = "gopass"
+)
+
 // UserHome returns the users home dir
 func UserHome() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {

diff --git a/pkg/appdir/appdir_windows.go b/pkg/appdir/appdir_windows.go
@@ -8,25 +8,25 @@ import (
 // UserConfig returns the users config dir
 func UserConfig() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".config", "gopass")
+		return filepath.Join(hd, ".config", Name)
 	}
 
-	return filepath.Join(os.Getenv("APPDATA"), "gopass")
+	return filepath.Join(os.Getenv("APPDATA"), Name)
 }
 
 // UserCache returns the users cache dir
 func UserCache() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".cache", "gopass")
+		return filepath.Join(hd, ".cache", Name)
 	}
 
-	return filepath.Join(os.Getenv("LOCALAPPDATA"), "gopass")
+	return filepath.Join(os.Getenv("LOCALAPPDATA"), Name)
 }
 
 // UserData returns the users data dir
 func UserData() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".local", "share", "gopass")
+		return filepath.Join(hd, ".local", "share", Name)
 	}
-	return filepath.Join(os.Getenv("LOCALAPPDATA"), "gopass")
+	return filepath.Join(os.Getenv("LOCALAPPDATA"), Name)
 }
diff --git a/pkg/appdir/appdir_xdg.go b/pkg/appdir/appdir_xdg.go
@@ -10,41 +10,41 @@ import (
 // UserConfig returns the users config dir
 func UserConfig() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".config", "gopass")
+		return filepath.Join(hd, ".config", Name)
 	}
 
 	base := os.Getenv("XDG_CONFIG_HOME")
 	if base == "" {
 		base = filepath.Join(os.Getenv("HOME"), ".config")
 	}
 
-	return filepath.Join(base, "gopass")
+	return filepath.Join(base, Name)
 }
 
 // UserCache returns the users cache dir
 func UserCache() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".cache", "gopass")
+		return filepath.Join(hd, ".cache", Name)
 	}
 
 	base := os.Getenv("XDG_CACHE_HOME")
 	if base == "" {
 		base = filepath.Join(os.Getenv("HOME"), ".cache")
 	}
 
-	return filepath.Join(base, "gopass")
+	return filepath.Join(base, Name)
 }
 
 // UserData returns the users data dir
 func UserData() string {
 	if hd := os.Getenv("GOPASS_HOMEDIR"); hd != "" {
-		return filepath.Join(hd, ".local", "share", "gopass")
+		return filepath.Join(hd, ".local", "share", Name)
 	}
 
 	base := os.Getenv("XDG_DATA_HOME")
 	if base == "" {
 		base = filepath.Join(os.Getenv("HOME"), ".local", "share")
 	}
 
-	return filepath.Join(base, "gopass")
+	return filepath.Join(base, Name)
 }