diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d72a89bdf..ebdf4a412 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -9,11 +9,6 @@ "ImportPath": "bazil.org/fuse", "Rev": "d62a1291477b51b24becf4def173bd843138c4b6" }, - { - "ImportPath": "bitbucket.org/kardianos/osext", - "Comment": "null-15", - "Rev": "44140c5fc69ecf1102c5ef451d73cd98ef59b178" - }, { "ImportPath": "code.google.com/p/go-uuid/uuid", "Comment": "null-12", @@ -139,7 +134,7 @@ }, { "ImportPath": "github.com/inconshreveable/go-update", - "Rev": "221d034a558b4c21b0624b2a450c076913854a57" + "Rev": "68f5725818189545231c1fd8694793d45f2fc529" }, { "ImportPath": "github.com/jackpal/go-nat-pmp", @@ -211,6 +206,10 @@ "ImportPath": "github.com/jbenet/goprocess", "Rev": "b4efc4c8775f0250710b39bfa716276ca10f85af" }, + { + "ImportPath": "github.com/kardianos/osext", + "Rev": "ccfcd0245381f0c94c68f50626665eed3c6b726a" + }, { "ImportPath": "github.com/kr/binarydist", "Rev": "9955b0ab8708602d411341e55fffd7e0700f86bd" diff --git a/Godeps/_workspace/src/github.com/inconshreveable/go-update/check/check.go b/Godeps/_workspace/src/github.com/inconshreveable/go-update/check/check.go index e8f7981f2..045da356d 100644 --- a/Godeps/_workspace/src/github.com/inconshreveable/go-update/check/check.go +++ b/Godeps/_workspace/src/github.com/inconshreveable/go-update/check/check.go @@ -10,8 +10,8 @@ import ( "net/http" "runtime" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bitbucket.org/kardianos/osext" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext" ) type Initiative string diff --git a/Godeps/_workspace/src/github.com/inconshreveable/go-update/update.go b/Godeps/_workspace/src/github.com/inconshreveable/go-update/update.go index e877a82ca..e2cb9b24f 100644 --- a/Godeps/_workspace/src/github.com/inconshreveable/go-update/update.go +++ b/Godeps/_workspace/src/github.com/inconshreveable/go-update/update.go @@ -113,7 +113,6 @@ while outputting a progress meter and supports resuming partial downloads. package update import ( - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bitbucket.org/kardianos/osext" "bytes" "crypto" "crypto/rsa" @@ -122,12 +121,14 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/download" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kr/binarydist" "io" "io/ioutil" "os" "path/filepath" + + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/download" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kardianos/osext" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/kr/binarydist" ) // The type of a binary patch, if any. Only bsdiff is supported diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE b/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE rename to Godeps/_workspace/src/github.com/kardianos/osext/LICENSE diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/README.md b/Godeps/_workspace/src/github.com/kardianos/osext/README.md new file mode 100644 index 000000000..820e1ecb5 --- /dev/null +++ b/Godeps/_workspace/src/github.com/kardianos/osext/README.md @@ -0,0 +1,14 @@ +### Extensions to the "os" package. + +## Find the current Executable and ExecutableFolder. + +There is sometimes utility in finding the current executable file +that is running. This can be used for upgrading the current executable +or finding resources located relative to the executable file. + +Multi-platform and supports: + * Linux + * OS X + * Windows + * Plan 9 + * BSDs. diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext.go similarity index 87% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext.go index 37efbb221..4ed4b9aa3 100644 --- a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go +++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext.go @@ -25,8 +25,3 @@ func ExecutableFolder() (string, error) { folder, _ := filepath.Split(p) return folder, nil } - -// Depricated. Same as Executable(). -func GetExePath() (exePath string, err error) { - return Executable() -} diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_plan9.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_plan9.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go similarity index 88% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go index 9c677c535..a50021ad5 100644 --- a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go +++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build linux netbsd openbsd solaris +// +build linux netbsd openbsd solaris dragonfly package osext @@ -19,7 +19,7 @@ func executable() (string, error) { return os.Readlink("/proc/self/exe") case "netbsd": return os.Readlink("/proc/curproc/exe") - case "openbsd": + case "openbsd", "dragonfly": return os.Readlink("/proc/curproc/file") case "solaris": return os.Readlink(fmt.Sprintf("/proc/%d/path/a.out", os.Getpid())) diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_windows.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_windows.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go