go-ipfs-config: Use gx vendored go-ipfs-utils where possible
For the rest of the packages in util, move them to thirdparty and update the references. util is gone! License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Feb 9, 2016 at 10:56 UTC
a7c4694354fd5d71f715a5fb36731e0f53cb112f
3 files changed
+4
-4
config/bootstrap_peers.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"fmt"
6
7
- iaddr "github.com/ipfs/go-ipfs/util/ipfsaddr"
7
+ iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
8
)
9
10
// DefaultBootstrapAddresses are the hardcoded bootstrap addresses
config/config.go
+2
-2
@@ -9,7 +9,7 @@ import (
9
"path/filepath"
10
"strings"
11
12
- u "github.com/ipfs/go-ipfs/util"
12
+ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
13
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
14
)
15
@@ -48,7 +48,7 @@ func PathRoot() (string, error) {
48
dir := os.Getenv(EnvDir)
49
var err error
50
if len(dir) == 0 {
51
- dir, err = u.TildeExpansion(DefaultPathRoot)
51
+ dir, err = homedir.Expand(DefaultPathRoot)
52
}
53
return dir, err
54
}
config/supernode.go
+1
-1
@@ -1,6 +1,6 @@
1
package config
2
3
-import "github.com/ipfs/go-ipfs/util/ipfsaddr"
3
+import "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
4
5
// TODO replace with final servers before merge
6