From ce4fff8198a42cf6a42e29490a85a9affc8a6f22 Mon Sep 17 00:00:00 2001 From: Dominic Della Valle Date: Mon, 8 Jul 2019 15:18:58 -0400 Subject: [PATCH] better hack --- cmd/ipfs/daemon.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 9d1fc14049b4..46f7a53d5916 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -246,16 +246,18 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment return err } - return doInit(os.Stdout, cctx.ConfigRoot, false, nBitsForKeypairDefault, nil, conf) - } - - cfgLocation = cctx.ConfigRoot - - if !fsrepo.IsInitialized(cfgLocation) { - err := initWithDefaults(os.Stdout, cfgLocation, profiles) - if err != nil { + if err = doInit(os.Stdout, cctx.ConfigRoot, false, nBitsForKeypairDefault, nil, conf); err != nil { return err } + } else { + cfgLocation = cctx.ConfigRoot + + if !fsrepo.IsInitialized(cfgLocation) { + err := initWithDefaults(os.Stdout, cfgLocation, profiles) + if err != nil { + return err + } + } } }