Fix $HOME env (#1250)

* Fix $HOME env

* Use strings.Join() to concat

diff --git a/cmd/bytomd/commands/root.go b/cmd/bytomd/commands/root.go
index 9398867..a678d3f 100644 (file)
--- a/cmd/bytomd/commands/root.go
+++ b/cmd/bytomd/commands/root.go
@@ -1,8 +1,12 @@
 package commands
 
 import (
+       "os/user"
+       "strings"
+
        "github.com/spf13/cobra"
        "github.com/spf13/viper"
+       cmn "github.com/tendermint/tmlibs/common"
 
        cfg "github.com/bytom/config"
 )
@@ -19,6 +23,15 @@ var RootCmd = &cobra.Command{
                if err != nil {
                        return err
                }
+               pathParts := strings.SplitN(config.RootDir, "/", 2)
+               if len(pathParts) == 2 && (pathParts[0] == "~" || pathParts[0] == "$HOME") {
+                       usr, err := user.Current()
+                       if err != nil {
+                               cmn.Exit("Error: " + err.Error())
+                       }
+                       pathParts[0] = usr.HomeDir
+                       config.RootDir = strings.Join(pathParts, "/")
+               }
                config.SetRoot(config.RootDir)
                return nil
        },