fix: always use files.cat

ipfs · Sep 13, 2016 · 5b8da13 · 5b8da13
1 parent 4e61958
commit 5b8da13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "detect-node": "^2.0.3",
     "glob": "^7.0.6",
     "hapi": "^15.0.3",
-    "ipfs-api": "^8.0.3",
+    "ipfs-api": "^8.0.4",
     "ipfs-bitswap": "^0.7.0",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.5.0",
@@ -132,4 +132,4 @@
     "nginnever <ginneversource@gmail.com>",
     "npmcdn-to-unpkg-bot <npmcdn-to-unpkg-bot@users.noreply.github.com>"
   ]
-}
+}
diff --git a/src/cli/commands/files/add.js b/src/cli/commands/files/add.js
@@ -55,11 +55,17 @@ module.exports = {
     const index = inPath.lastIndexOf('/') + 1
 
     utils.getIPFS((err, ipfs) => {
-      if (err) throw err
+      if (err) {
+        throw err
+      }
 
       glob(path.join(inPath, '/**/*'), (err, list) => {
-        if (err) throw err
-        if (list.length === 0) list = [inPath]
+        if (err) {
+          throw err
+        }
+        if (list.length === 0) {
+          list = [inPath]
+        }
 
         pull(
           zip(

diff --git a/src/cli/commands/files/cat.js b/src/cli/commands/files/cat.js
@@ -19,10 +19,6 @@ module.exports = {
         throw err
       }
 
-      if (utils.isDaemonOn()) {
-        return ipfs.cat(path, onFile)
-      }
-
       ipfs.files.cat(path, onFile)
     })
   }