From d61c3f59386bac2064d85525344373cddac8a9e8 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Sat, 8 Jul 2017 11:20:05 +0200 Subject: [PATCH] Update dependency osext to support Android --- vendor/github.com/kardianos/osext/README.md | 5 +++++ vendor/github.com/kardianos/osext/osext_go18.go | 9 +++++++++ vendor/github.com/kardianos/osext/osext_plan9.go | 2 ++ vendor/github.com/kardianos/osext/osext_procfs.go | 4 ++-- vendor/github.com/kardianos/osext/osext_sysctl.go | 2 +- vendor/github.com/kardianos/osext/osext_windows.go | 2 ++ vendor/vendor.json | 5 +++-- 7 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 vendor/github.com/kardianos/osext/osext_go18.go diff --git a/vendor/github.com/kardianos/osext/README.md b/vendor/github.com/kardianos/osext/README.md index 61350baba..15cbc3d95 100644 --- a/vendor/github.com/kardianos/osext/README.md +++ b/vendor/github.com/kardianos/osext/README.md @@ -1,7 +1,12 @@ ### Extensions to the "os" package. +[![GoDoc](https://godoc.org/github.com/kardianos/osext?status.svg)](https://godoc.org/github.com/kardianos/osext) + ## Find the current Executable and ExecutableFolder. +As of go1.8 the Executable function may be found in `os`. The Executable function +in the std lib `os` package is used if available. + 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. Both diff --git a/vendor/github.com/kardianos/osext/osext_go18.go b/vendor/github.com/kardianos/osext/osext_go18.go new file mode 100644 index 000000000..009d8a926 --- /dev/null +++ b/vendor/github.com/kardianos/osext/osext_go18.go @@ -0,0 +1,9 @@ +//+build go1.8,!openbsd + +package osext + +import "os" + +func executable() (string, error) { + return os.Executable() +} diff --git a/vendor/github.com/kardianos/osext/osext_plan9.go b/vendor/github.com/kardianos/osext/osext_plan9.go index 655750c54..95e237137 100644 --- a/vendor/github.com/kardianos/osext/osext_plan9.go +++ b/vendor/github.com/kardianos/osext/osext_plan9.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//+build !go1.8 + package osext import ( diff --git a/vendor/github.com/kardianos/osext/osext_procfs.go b/vendor/github.com/kardianos/osext/osext_procfs.go index d59847ee5..e1f16f885 100644 --- a/vendor/github.com/kardianos/osext/osext_procfs.go +++ b/vendor/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 solaris dragonfly +// +build !go1.8,android !go1.8,linux !go1.8,netbsd !go1.8,solaris !go1.8,dragonfly package osext @@ -16,7 +16,7 @@ import ( func executable() (string, error) { switch runtime.GOOS { - case "linux": + case "linux", "android": const deletedTag = " (deleted)" execpath, err := os.Readlink("/proc/self/exe") if err != nil { diff --git a/vendor/github.com/kardianos/osext/osext_sysctl.go b/vendor/github.com/kardianos/osext/osext_sysctl.go index 66da0bcf9..33cee2522 100644 --- a/vendor/github.com/kardianos/osext/osext_sysctl.go +++ b/vendor/github.com/kardianos/osext/osext_sysctl.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 darwin freebsd openbsd +// +build !go1.8,darwin !go1.8,freebsd openbsd package osext diff --git a/vendor/github.com/kardianos/osext/osext_windows.go b/vendor/github.com/kardianos/osext/osext_windows.go index 72d282cf8..074b3b385 100644 --- a/vendor/github.com/kardianos/osext/osext_windows.go +++ b/vendor/github.com/kardianos/osext/osext_windows.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//+build !go1.8 + package osext import ( diff --git a/vendor/vendor.json b/vendor/vendor.json index d8aac32d0..e1719e3e4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -658,9 +658,10 @@ "revisionTime": "2017-05-04T20:45:05Z" }, { - "checksumSHA1": "6nmAJBw2phU9MUmkUnqFvbO5urg=", + "checksumSHA1": "gEjGS03N1eysvpQ+FCHTxPcbxXc=", "path": "github.com/kardianos/osext", - "revision": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc" + "revision": "ae77be60afb1dcacde03767a8c37337fad28ac14", + "revisionTime": "2017-05-10T13:15:34Z" }, { "checksumSHA1": "yIeeBxrnquUChoE+Rpz7qU6WygQ=",