From 8f9b8a8550a4f1ff483065991427c2535440df5c Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 28 Sep 2014 23:10:43 +0200 Subject: [PATCH] Fork osext and support Solaris --- Godeps/Godeps.json | 9 ++++----- .../kardianos => github.com/calmh}/osext/LICENSE | 0 .../kardianos => github.com/calmh}/osext/osext.go | 0 .../kardianos => github.com/calmh}/osext/osext_plan9.go | 0 .../kardianos => github.com/calmh}/osext/osext_procfs.go | 5 ++++- .../kardianos => github.com/calmh}/osext/osext_sysctl.go | 0 .../kardianos => github.com/calmh}/osext/osext_test.go | 0 .../calmh}/osext/osext_windows.go | 0 internal/upgrade/upgrade_common.go | 2 +- internal/upgrade/upgrade_supported.go | 2 +- internal/upgrade/upgrade_unsupp.go | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/LICENSE (100%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext.go (100%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext_plan9.go (100%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext_procfs.go (79%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext_sysctl.go (100%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext_test.go (100%) rename Godeps/_workspace/src/{bitbucket.org/kardianos => github.com/calmh}/osext/osext_windows.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c7df39a3f..91a14f9b0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -5,11 +5,6 @@ "./cmd/..." ], "Deps": [ - { - "ImportPath": "bitbucket.org/kardianos/osext", - "Comment": "null-13", - "Rev": "5d3ddcf53a508cc2f7404eaebf546ef2cb5cdb6e" - }, { "ImportPath": "code.google.com/p/go.crypto/bcrypt", "Comment": "null-216", @@ -39,6 +34,10 @@ "ImportPath": "github.com/bkaradzic/go-lz4", "Rev": "93a831dcee242be64a9cc9803dda84af25932de7" }, + { + "ImportPath": "github.com/calmh/osext", + "Rev": "9bf61584e5f1f172e8766ddc9022d9c401faaa5e" + }, { "ImportPath": "github.com/calmh/xdr", "Rev": "a597b63b87d6140f79084c8aab214b4d533833a1" diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE b/Godeps/_workspace/src/github.com/calmh/osext/LICENSE similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE rename to Godeps/_workspace/src/github.com/calmh/osext/LICENSE diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go b/Godeps/_workspace/src/github.com/calmh/osext/osext.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go rename to Godeps/_workspace/src/github.com/calmh/osext/osext.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_plan9.go b/Godeps/_workspace/src/github.com/calmh/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/calmh/osext/osext_plan9.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go b/Godeps/_workspace/src/github.com/calmh/osext/osext_procfs.go similarity index 79% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go rename to Godeps/_workspace/src/github.com/calmh/osext/osext_procfs.go index 546fec915..9c677c535 100644 --- a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go +++ b/Godeps/_workspace/src/github.com/calmh/osext/osext_procfs.go @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build linux netbsd openbsd +// +build linux netbsd openbsd solaris package osext import ( "errors" + "fmt" "os" "runtime" ) @@ -20,6 +21,8 @@ func executable() (string, error) { return os.Readlink("/proc/curproc/exe") case "openbsd": return os.Readlink("/proc/curproc/file") + case "solaris": + return os.Readlink(fmt.Sprintf("/proc/%d/path/a.out", os.Getpid())) } return "", errors.New("ExecPath not implemented for " + runtime.GOOS) } diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go b/Godeps/_workspace/src/github.com/calmh/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/calmh/osext/osext_sysctl.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go b/Godeps/_workspace/src/github.com/calmh/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/calmh/osext/osext_test.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_windows.go b/Godeps/_workspace/src/github.com/calmh/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/calmh/osext/osext_windows.go diff --git a/internal/upgrade/upgrade_common.go b/internal/upgrade/upgrade_common.go index 958935529..50a0e0cc5 100644 --- a/internal/upgrade/upgrade_common.go +++ b/internal/upgrade/upgrade_common.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "bitbucket.org/kardianos/osext" + "github.com/calmh/osext" ) type Release struct { diff --git a/internal/upgrade/upgrade_supported.go b/internal/upgrade/upgrade_supported.go index e67f56080..e6953999f 100644 --- a/internal/upgrade/upgrade_supported.go +++ b/internal/upgrade/upgrade_supported.go @@ -2,7 +2,7 @@ // All rights reserved. Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build !solaris,!windows,!noupgrade +// +build !windows,!noupgrade package upgrade diff --git a/internal/upgrade/upgrade_unsupp.go b/internal/upgrade/upgrade_unsupp.go index a9daca075..5dbe3e42d 100644 --- a/internal/upgrade/upgrade_unsupp.go +++ b/internal/upgrade/upgrade_unsupp.go @@ -2,7 +2,7 @@ // All rights reserved. Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. -// +build solaris noupgrade +// +build noupgrade package upgrade