aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ethereum.go
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-06-11 18:33:11 +0800
committerMaran <maran.hidskes@gmail.com>2014-06-11 18:33:11 +0800
commite36badd744bc79c652deb3d45da1438982ec622a (patch)
treedbb2eb7e665067bb3a183311999862c1a65b1311 /ethereal/ethereum.go
parent57e3b1b093a2533e26198e9198b85556bf362b27 (diff)
downloadgo-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar.gz
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar.bz2
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar.lz
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar.xz
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.tar.zst
go-tangerine-e36badd744bc79c652deb3d45da1438982ec622a.zip
Reimplement -datadir flag. Implements #79
The config file is actually loaded from the folder that datadir points at
Diffstat (limited to 'ethereal/ethereum.go')
-rw-r--r--ethereal/ethereum.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
index b6e1c681b..7ace16760 100644
--- a/ethereal/ethereum.go
+++ b/ethereal/ethereum.go
@@ -43,14 +43,14 @@ func main() {
ethchain.InitFees()
g, err := globalconf.NewWithOptions(&globalconf.Options{
- Filename: path.Join(ethutil.ApplicationFolder(".ethereal"), "conf.ini"),
+ Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"),
})
if err != nil {
fmt.Println(err)
} else {
g.ParseAll()
}
- ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, g, Identifier)
+ ethutil.ReadConfig(Datadir, ethutil.LogFile|ethutil.LogStd, g, Identifier)
// Instantiated a eth stack
ethereum, err := eth.New(eth.CapDefault, UseUPnP)