#141 [SL] - Change wahay config path on Windows.

digitalautonomy · Jan 23, 2025 · df23aa7 · df23aa7
1 parent ae802e4
commit df23aa7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -43,7 +43,7 @@ func (cs *ConfigSuite) Test_DetectPersistance_setsPersistentModeToFalseWhenFileD
 	err := os.MkdirAll(wahayDir, 0755)
 	c.Assert(err, IsNil)
 
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	ac := New()
 	filename, err := ac.DetectPersistence()
@@ -66,7 +66,7 @@ func (cs *ConfigSuite) Test_DetectPersistance_setsPersistentModeToTrueWhenFileEx
 	c.Assert(err, IsNil)
 	configFile.Close()
 
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	ac := New()
 	filename, err := ac.DetectPersistence()
@@ -180,7 +180,7 @@ func (cs *ConfigSuite) Test_getRealConfigFile_returnsEncryptedFile(c *C) {
 	c.Assert(err, IsNil)
 	file.Close()
 
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{}
 
@@ -204,7 +204,7 @@ func (cs *ConfigSuite) Test_getRealConfigFile_returnsUnencryptedFile(c *C) {
 	c.Assert(err, IsNil)
 	file.Close()
 
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{}
 
@@ -223,7 +223,7 @@ func (cs *ConfigSuite) Test_getRealConfigFile_returnsEmptyStringWhenFileDoesNotE
 	err := os.MkdirAll(wahayDir, 0755)
 	c.Assert(err, IsNil)
 
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{}
 
@@ -396,7 +396,7 @@ func (cs *ConfigSuite) Test_doAfterSave_addFunctionToList(c *C) {
 
 func (cs *ConfigSuite) Test_EnsureDestination_createsEncryptedConfigFile(c *C) {
 	tempDir := c.MkDir()
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{
 		filename:      "",
@@ -412,7 +412,7 @@ func (cs *ConfigSuite) Test_EnsureDestination_createsEncryptedConfigFile(c *C) {
 
 func (cs *ConfigSuite) Test_EnsureDestination_createsUnencryptedConfigFile(c *C) {
 	tempDir := c.MkDir()
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{
 		filename:      "",
@@ -428,7 +428,7 @@ func (cs *ConfigSuite) Test_EnsureDestination_createsUnencryptedConfigFile(c *C)
 
 func (cs *ConfigSuite) Test_EnsureDestination_changesFileSuffixToAValidEncryptedSuffix(c *C) {
 	tempDir := c.MkDir()
-	defer gostub.New().Stub(&XdgConfigHome, func() string { return tempDir }).Reset()
+	defer gostub.New().Stub(&SystemConfigDir, func() string { return tempDir }).Reset()
 
 	a := &ApplicationConfig{
 		filename:      "config.json",

diff --git a/config/file.go b/config/file.go
@@ -83,11 +83,6 @@ func TorDir() string {
 	return filepath.Join(Dir(), "tor")
 }
 
-// SystemConfigDir returns the application data directory, valid on both windows and posix systems
-func SystemConfigDir() string {
-	return XdgConfigHome()
-}
-
 // RemoveAll removes a directory and it's children
 func RemoveAll(dir string) error {
 	return os.RemoveAll(dir)

diff --git a/config/os_posix.go b/config/os_posix.go
@@ -11,7 +11,10 @@ func IsWindows() bool {
 }
 
 // SystemDataDir points to the function that gets the data directory for this system
-var SystemDataDir = XdgDataHome
+var (
+	SystemDataDir   = XdgDataHome
+	SystemConfigDir = XdgConfigHome
+)
 
 func localHome() string {
 	u, e := user.Current()

diff --git a/config/os_windows.go b/config/os_windows.go
@@ -31,7 +31,10 @@ func appdataFolderPath() string {
 }
 
 // SystemDataDir points to the function that gets the data directory for this system
-var SystemDataDir = appdataFolderPath
+var (
+	SystemDataDir   = appdataFolderPath
+	SystemConfigDir = appdataFolderPath
+)
 
 func firstEnvironmentVariable(vs ...string) string {
 	for _, v := range vs {