Update dependency osext to support Android

This commit is contained in:
Rickard von Essen 2017-07-08 11:20:05 +02:00
parent 1d457979ea
commit d61c3f5938
7 changed files with 24 additions and 5 deletions

View File

@ -1,7 +1,12 @@
### Extensions to the "os" package. ### 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. ## 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 There is sometimes utility in finding the current executable file
that is running. This can be used for upgrading the current executable that is running. This can be used for upgrading the current executable
or finding resources located relative to the executable file. Both or finding resources located relative to the executable file. Both

9
vendor/github.com/kardianos/osext/osext_go18.go generated vendored Normal file
View File

@ -0,0 +1,9 @@
//+build go1.8,!openbsd
package osext
import "os"
func executable() (string, error) {
return os.Executable()
}

View File

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//+build !go1.8
package osext package osext
import ( import (

View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // 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 package osext
@ -16,7 +16,7 @@ import (
func executable() (string, error) { func executable() (string, error) {
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux", "android":
const deletedTag = " (deleted)" const deletedTag = " (deleted)"
execpath, err := os.Readlink("/proc/self/exe") execpath, err := os.Readlink("/proc/self/exe")
if err != nil { if err != nil {

View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build darwin freebsd openbsd // +build !go1.8,darwin !go1.8,freebsd openbsd
package osext package osext

View File

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//+build !go1.8
package osext package osext
import ( import (

5
vendor/vendor.json vendored
View File

@ -658,9 +658,10 @@
"revisionTime": "2017-05-04T20:45:05Z" "revisionTime": "2017-05-04T20:45:05Z"
}, },
{ {
"checksumSHA1": "6nmAJBw2phU9MUmkUnqFvbO5urg=", "checksumSHA1": "gEjGS03N1eysvpQ+FCHTxPcbxXc=",
"path": "github.com/kardianos/osext", "path": "github.com/kardianos/osext",
"revision": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc" "revision": "ae77be60afb1dcacde03767a8c37337fad28ac14",
"revisionTime": "2017-05-10T13:15:34Z"
}, },
{ {
"checksumSHA1": "yIeeBxrnquUChoE+Rpz7qU6WygQ=", "checksumSHA1": "yIeeBxrnquUChoE+Rpz7qU6WygQ=",