refactor: follow XDG spec more closely

dpastoor · May 29, 2022 · 3029ed3 · 3029ed3
1 parent 1f17a81
commit 3029ed3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/config/fs.go b/internal/config/fs.go
@@ -14,13 +14,16 @@ func GetConfigPath() (string, error) {
 func GetRootConfigPath() string {
 	return filepath.Join(xdg.ConfigHome, "qvm")
 }
+func GetRootDataPath() string {
+	return filepath.Join(xdg.DataHome, "qvm")
+}
 
 func GetPathToActiveBinDir() string {
-	return filepath.Join(xdg.DataHome, "qvm", "active", "bin")
+	return filepath.Join(xdg.ConfigHome, "qvm", "bin")
 }
 
 func GetPathToVersionsDir() string {
-	return filepath.Join(xdg.ConfigHome, "qvm", "versions")
+	return filepath.Join(xdg.DataHome, "qvm", "versions")
 }
 
 // GetInstalledVersions returns a map of installed versions where they key is the version

diff --git a/main.go b/main.go
@@ -21,7 +21,7 @@ func main() {
 	if runtime.GOOS == "darwin" {
 		hd, _ := os.UserHomeDir()
 		os.Setenv("XDG_CONFIG_HOME", filepath.Join(hd, ".config"))
-		os.Setenv("XDG_DATA_HOME", filepath.Join(hd, ".config"))
+		os.Setenv("XDG_DATA_HOME", filepath.Join(hd, ".local", "share"))
 		xdg.Reload()
 	}
 	cmd.Execute(version, os.Args[1:])