From 9adb3f5def03da4eb5abdf3e00c0d62b3fbf57b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 16 Oct 2018 13:45:30 +0200 Subject: [PATCH 1/2] gx: update to use extracted go-ipfs-files --- cli/parse.go | 2 +- http/client.go | 5 +++-- http/parse.go | 5 +++-- package.json | 10 ++++++++-- request.go | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cli/parse.go b/cli/parse.go index 96ac22da..bea91483 100644 --- a/cli/parse.go +++ b/cli/parse.go @@ -14,7 +14,7 @@ import ( osh "github.com/Kubuxu/go-os-helper" "github.com/ipfs/go-ipfs-cmdkit" - "github.com/ipfs/go-ipfs-cmdkit/files" + "github.com/ipfs/go-ipfs-files" logging "github.com/ipfs/go-log" ) diff --git a/http/client.go b/http/client.go index 39dc3f12..0645af75 100644 --- a/http/client.go +++ b/http/client.go @@ -10,9 +10,10 @@ import ( "net/url" "strings" - "github.com/ipfs/go-ipfs-cmdkit" - "github.com/ipfs/go-ipfs-cmdkit/files" cmds "github.com/ipfs/go-ipfs-cmds" + + "github.com/ipfs/go-ipfs-cmdkit" + "github.com/ipfs/go-ipfs-files" ) const ( diff --git a/http/parse.go b/http/parse.go index 9e3a6c6e..70ed8019 100644 --- a/http/parse.go +++ b/http/parse.go @@ -9,9 +9,10 @@ import ( "strconv" "strings" - "github.com/ipfs/go-ipfs-cmdkit" - "github.com/ipfs/go-ipfs-cmdkit/files" cmds "github.com/ipfs/go-ipfs-cmds" + + "github.com/ipfs/go-ipfs-cmdkit" + "github.com/ipfs/go-ipfs-files" ) // parseRequest parses the data in a http.Request and returns a command Request object diff --git a/package.json b/package.json index 846ad7c4..d523b007 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "version": "1.2.8" }, { - "hash": "QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky", + "hash": "Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg", "name": "go-ipfs-cmdkit", - "version": "1.1.3" + "version": "1.2.0" }, { "author": "texttheater", @@ -40,6 +40,12 @@ "hash": "QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93", "name": "go-os-helper", "version": "0.0.0" + }, + { + "author": "magik6k", + "hash": "QmPPTbdBVPWgSwtDzL4ftVc5E3TH32oUtnov3RFNwbEoR4", + "name": "go-ipfs-files", + "version": "1.0.0" } ], "gxVersion": "0.10.0", diff --git a/request.go b/request.go index e9adade2..169a4dd0 100644 --- a/request.go +++ b/request.go @@ -6,7 +6,7 @@ import ( "reflect" "github.com/ipfs/go-ipfs-cmdkit" - "github.com/ipfs/go-ipfs-cmdkit/files" + "github.com/ipfs/go-ipfs-files" ) // Request represents a call to a command from a consumer From 2327d389292b68353dbd77d5e6c8f25f75208678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 16 Oct 2018 13:54:43 +0200 Subject: [PATCH 2/2] gx publish 2.0.2 --- .gx/lastpubver | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gx/lastpubver b/.gx/lastpubver index 451c3beb..30ec5fed 100644 --- a/.gx/lastpubver +++ b/.gx/lastpubver @@ -1 +1 @@ -2.0.1: QmXTmUCBtDUrzDYVzASogLiNph7EBuYqEgPL7QoHNMzUnz +2.0.2: QmVy9gWXWJB8GrQG85Sq7hCknC6ANqZjJCZkRo8Y6sk5tx diff --git a/package.json b/package.json index d523b007..ef700b7a 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,6 @@ "license": "MIT", "name": "go-ipfs-cmds", "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", - "version": "2.0.1" + "version": "2.0.2" }