Merge pull request #896 from ipfs/fix/daemon-start

fix: not masking error message when starting daemon
ipfs · Jul 4, 2017 · ea8de20 · ea8de20
2 parents ce504cd + fe48c3e
commit ea8de20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cli/commands/daemon.js b/src/cli/commands/daemon.js
@@ -28,8 +28,8 @@ module.exports = {
     httpAPI = new HttpAPI(process.env.IPFS_PATH, argv)
 
     httpAPI.start((err) => {
-      if (err && err.code === 'ENOENT') {
-        console.log('Error: no ipfs repo found in ' + repoPath)
+      if (err && err.code === 'ENOENT' && err.message.match(/Uninitalized repo/i)) {
+        console.log('Error: no initialized ipfs repo found in ' + repoPath)
         console.log('please run: jsipfs init')
         process.exit(1)
       }

diff --git a/test/cli/daemon.js b/test/cli/daemon.js
@@ -17,7 +17,7 @@ describe('daemon', () => {
   afterEach(() => clean(repoPath))
 
   it('gives error if user hasn\'t run init before', (done) => {
-    const expectedError = 'no ipfs repo found in ' + repoPath
+    const expectedError = 'no initialized ipfs repo found in ' + repoPath
 
     ipfs('daemon').catch((err) => {
       expect(err.stdout).to.have.string(expectedError)