|
|
@ -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 |
|
|
|