diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-12 19:39:38 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-12 19:39:38 +0800 |
| commit | aaac1f0cdd7a583448b71b26866f70f5f065378d (patch) | |
| tree | b062611219238127f6cd60daae698751a396acd3 /cmd/utils | |
| parent | 4bb9a61049882f427e2742773c69b969849da1c2 (diff) | |
| parent | 55a796b7c3a9560f27b0bfc7fe064e84d1b36608 (diff) | |
| download | dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar.gz dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar.bz2 dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar.lz dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar.xz dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.tar.zst dexon-aaac1f0cdd7a583448b71b26866f70f5f065378d.zip | |
Merge pull request #1254 from bas-vk/ipcwindowspathfix
Invalid named pipe name
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 80f21d50a..ec29598fb 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -385,9 +385,28 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager { return accounts.NewManager(ks) } +func IpcSocketPath(ctx *cli.Context) (ipcpath string) { + if common.IsWindows() { + ipcpath = common.DefaultIpcPath() + if ipcpath != ctx.GlobalString(IPCPathFlag.Name) { + ipcpath = ctx.GlobalString(IPCPathFlag.Name) + } + } else { + ipcpath = common.DefaultIpcPath() + if ctx.GlobalString(IPCPathFlag.Name) != common.DefaultIpcPath() { + ipcpath = ctx.GlobalString(IPCPathFlag.Name) + } else if ctx.GlobalString(DataDirFlag.Name) != "" && + ctx.GlobalString(DataDirFlag.Name) != common.DefaultDataDir() { + ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc") + } + } + + return +} + func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error { config := comms.IpcConfig{ - Endpoint: filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc"), + Endpoint: IpcSocketPath(ctx), } xeth := xeth.New(eth, nil) |