diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-30 22:56:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-30 22:56:56 +0800 |
| commit | 65c5a20e1c04c996f96f81cd959ab986b8482b6a (patch) | |
| tree | 9f34f820c3667cd586d8f09ef7954bb10eb2c3d5 /ethereum | |
| parent | 1020d7ff67e4888abbe27f8e1a4d516b4c48231c (diff) | |
| download | go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar.gz go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar.bz2 go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar.lz go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar.xz go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.tar.zst go-tangerine-65c5a20e1c04c996f96f81cd959ab986b8482b6a.zip | |
Added config file setup. Fixes #59
* Also fixes asset path problems
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/config.go | 18 | ||||
| -rw-r--r-- | ethereum/ethereum.go | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/ethereum/config.go b/ethereum/config.go index 5da910f2b..39dc11727 100644 --- a/ethereum/config.go +++ b/ethereum/config.go @@ -20,7 +20,6 @@ var UseSeed bool var ImportKey string var ExportKey bool var LogFile string -var DataDir string var NonInteractive bool var StartJsConsole bool var InputFile string @@ -31,22 +30,21 @@ func Init() { flag.PrintDefaults() } - flag.StringVar(&Identifier, "i", "", "custom client identifier") - flag.BoolVar(&StartMining, "m", false, "start dagger mining") - flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits") - flag.BoolVar(&StartRpc, "r", false, "start rpc server") + flag.StringVar(&Identifier, "id", "", "Custom client identifier") + flag.StringVar(&OutboundPort, "port", "30303", "listening port") + flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") + flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") + flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") + flag.BoolVar(&StartJsConsole, "js", false, "exp") + + flag.BoolVar(&StartMining, "mine", false, "start dagger mining") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") - flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&ExportKey, "export", false, "export private key") - flag.StringVar(&OutboundPort, "p", "30303", "listening port") flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") - flag.StringVar(&DataDir, "dir", ".ethereum", "ethereum data directory") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") - flag.IntVar(&MaxPeer, "x", 10, "maximum desired peers") - flag.BoolVar(&StartJsConsole, "js", false, "exp") flag.Parse() diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 34bacb7b9..7bb668235 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -59,7 +59,7 @@ func main() { lt = ethutil.LogFile | ethutil.LogStd } - ethutil.ReadConfig(DataDir, lt, Identifier) + ethutil.ReadConfig(".ethereum", lt, Identifier) logger := ethutil.Config.Log |