aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2015-07-02 23:20:58 +0800
committerBas van Kervel <bas@ethdev.com>2015-07-02 23:25:11 +0800
commit56ed4084368e55bbcf9df4d7ef2e24662b8329d9 (patch)
tree260da95d2bddad5c690360ea8bc0b794070df8ca /cmd
parent6be527dd52f0b40da87a6e2dc372fba5a08dd33a (diff)
downloadgo-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar.gz
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar.bz2
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar.lz
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar.xz
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.tar.zst
go-tangerine-56ed4084368e55bbcf9df4d7ef2e24662b8329d9.zip
ipcpath issue fix
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 6f319eb40..45164741d 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -432,17 +432,17 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
func IpcSocketPath(ctx *cli.Context) (ipcpath string) {
if common.IsWindows() {
ipcpath = common.DefaultIpcPath()
- if ipcpath != ctx.GlobalString(IPCPathFlag.Name) {
+ if ctx.GlobalIsSet(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() {
+ if ctx.GlobalIsSet(DataDirFlag.Name) {
ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc")
}
+ if ctx.GlobalIsSet(IPCPathFlag.Name) {
+ ipcpath = ctx.GlobalString(IPCPathFlag.Name)
+ }
}
return