Merge pull request #4857 from ipfs/extract/thirdparty-tar

Extract: thirdparty/tar
ipfs · Mar 23, 2018 · 1fb90ad · 1fb90ad
2 parents 8dbdb29 + 9a2f297
commit 1fb90ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 133 deletions.
diff --git a/core/commands/get.go b/core/commands/get.go
@@ -13,9 +13,9 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	path "github.com/ipfs/go-ipfs/path"
-	tar "github.com/ipfs/go-ipfs/thirdparty/tar"
 	uarchive "github.com/ipfs/go-ipfs/unixfs/archive"
 
+	tar "gx/ipfs/QmYk64JEF4QWPB9Kqib63g8vfYfv78AmSUyeFaMaX6F9vQ/tar-utils"
 	"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
 	"gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb"
 	"gx/ipfs/QmfAkMSt9Fwzk48QDJecPcwCUjnf2uG7MLnmCGTp4C6ouL/go-ipfs-cmds"

diff --git a/package.json b/package.json
@@ -575,6 +575,12 @@
       "hash": "QmdbxjQWogRCHRaxhhGnYdT1oQJzL9GdqSKzCdqWr85AP2",
       "name": "pubsub",
       "version": "1.0.0"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmYk64JEF4QWPB9Kqib63g8vfYfv78AmSUyeFaMaX6F9vQ",
+      "name": "tar-utils",
+      "version": "0.0.2"
     }
   ],
   "gxVersion": "0.10.0",

diff --git a/thirdparty/tar/extractor.go b/thirdparty/tar/extractor.go