Skip to content

G
Geth-Modification
Commit 89525fcb authored by Bas van Kervel's avatar Bas van Kervel
Browse files
Options

ipcpath issue fix

parent c2590af7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
cmd/utils/flags.go
View file @ 89525fcb
...@@ -438,17 +438,17 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager { ...@@ -438,17 +438,17 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
func IpcSocketPath(ctx *cli.Context) (ipcpath string) { func IpcSocketPath(ctx *cli.Context) (ipcpath string) {
if common.IsWindows() { if common.IsWindows() {
ipcpath = common.DefaultIpcPath() ipcpath = common.DefaultIpcPath()
if ipcpath != ctx.GlobalString(IPCPathFlag.Name) { if ctx.GlobalIsSet(IPCPathFlag.Name) {
ipcpath = ctx.GlobalString(IPCPathFlag.Name) ipcpath = ctx.GlobalString(IPCPathFlag.Name)
} }
} else { } else {
ipcpath = common.DefaultIpcPath() ipcpath = common.DefaultIpcPath()
if ctx.GlobalString(IPCPathFlag.Name) != common.DefaultIpcPath() { if ctx.GlobalIsSet(DataDirFlag.Name) {
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") ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc")
} }
if ctx.GlobalIsSet(IPCPathFlag.Name) {
ipcpath = ctx.GlobalString(IPCPathFlag.Name)
}
} }
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment