Merge pull request #906 from freewind/improve-data-dir

Improve the code to determine default data dir

diff --git a/config/config.go b/config/config.go
index a902337..5fe31e6 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -198,18 +198,17 @@ func rootify(path, root string) string {
 func DefaultDataDir() string {
        // Try to place the data folder in the user's home dir
        home := homeDir()
-       dataDir := "./.bytom"
-       if home != "" {
-               switch runtime.GOOS {
-               case "darwin":
-                       dataDir = filepath.Join(home, "Library", "Bytom")
-               case "windows":
-                       dataDir = filepath.Join(home, "AppData", "Roaming", "Bytom")
-               default:
-                       dataDir = filepath.Join(home, ".bytom")
-               }
+       if home == "" {
+               return "./.bytom"
+       }
+       switch runtime.GOOS {
+       case "darwin":
+               return filepath.Join(home, "Library", "Bytom")
+       case "windows":
+               return filepath.Join(home, "AppData", "Roaming", "Bytom")
+       default:
+               return filepath.Join(home, ".bytom")
        }
-       return dataDir
 }
 
 func homeDir() string {