From 154fc59e93805bf5844935517db741be2556a1aa Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 23 Feb 2015 09:46:38 +0100 Subject: [PATCH] Switch back to original kardianos/osext --- Godeps/Godeps.json | 8 +++--- .../src/github.com/calmh/osext/LICENSE | 20 -------------- .../src/github.com/kardianos/osext/LICENSE | 27 +++++++++++++++++++ .../src/github.com/kardianos/osext/README.md | 14 ++++++++++ .../{calmh => kardianos}/osext/osext.go | 5 ---- .../{calmh => kardianos}/osext/osext_plan9.go | 18 ++++++------- .../osext/osext_procfs.go | 4 +-- .../osext/osext_sysctl.go | 0 .../{calmh => kardianos}/osext/osext_test.go | 0 .../osext/osext_windows.go | 0 internal/upgrade/upgrade_common.go | 2 +- 11 files changed, 57 insertions(+), 41 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/calmh/osext/LICENSE create mode 100644 Godeps/_workspace/src/github.com/kardianos/osext/LICENSE create mode 100644 Godeps/_workspace/src/github.com/kardianos/osext/README.md rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext.go (87%) rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext_plan9.go (51%) rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext_procfs.go (88%) rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext_sysctl.go (100%) rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext_test.go (100%) rename Godeps/_workspace/src/github.com/{calmh => kardianos}/osext/osext_windows.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 295185a8b..cf3919e11 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -17,10 +17,6 @@ "ImportPath": "github.com/calmh/luhn", "Rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632" }, - { - "ImportPath": "github.com/calmh/osext", - "Rev": "9bf61584e5f1f172e8766ddc9022d9c401faaa5e" - }, { "ImportPath": "github.com/calmh/xdr", "Rev": "ff948d7666c5e0fd18d398f6278881724d36a90b" @@ -29,6 +25,10 @@ "ImportPath": "github.com/juju/ratelimit", "Rev": "f9f36d11773655c0485207f0ad30dc2655f69d56" }, + { + "ImportPath": "github.com/kardianos/osext", + "Rev": "91292666f7e40f03185cdd1da7d85633c973eca7" + }, { "ImportPath": "github.com/syncthing/protocol", "Rev": "2e2d479103df8fb721d55d59b0198d6c24f4865b" diff --git a/Godeps/_workspace/src/github.com/calmh/osext/LICENSE b/Godeps/_workspace/src/github.com/calmh/osext/LICENSE deleted file mode 100644 index 18527a28f..000000000 --- a/Godeps/_workspace/src/github.com/calmh/osext/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2012 Daniel Theophanes - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE b/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE new file mode 100644 index 000000000..744875676 --- /dev/null +++ b/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2012 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 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/github.com/calmh/osext/osext.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext.go similarity index 87% rename from Godeps/_workspace/src/github.com/calmh/osext/osext.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext.go index 37efbb221..4ed4b9aa3 100644 --- a/Godeps/_workspace/src/github.com/calmh/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/github.com/calmh/osext/osext_plan9.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go similarity index 51% rename from Godeps/_workspace/src/github.com/calmh/osext/osext_plan9.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go index 4468a73a7..655750c54 100644 --- a/Godeps/_workspace/src/github.com/calmh/osext/osext_plan9.go +++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go @@ -5,16 +5,16 @@ package osext import ( - "syscall" - "os" - "strconv" + "os" + "strconv" + "syscall" ) func executable() (string, error) { - f, err := os.Open("/proc/" + strconv.Itoa(os.Getpid()) + "/text") - if err != nil { - return "", err - } - defer f.Close() - return syscall.Fd2path(int(f.Fd())) + f, err := os.Open("/proc/" + strconv.Itoa(os.Getpid()) + "/text") + if err != nil { + return "", err + } + defer f.Close() + return syscall.Fd2path(int(f.Fd())) } diff --git a/Godeps/_workspace/src/github.com/calmh/osext/osext_procfs.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go similarity index 88% rename from Godeps/_workspace/src/github.com/calmh/osext/osext_procfs.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go index 9c677c535..a50021ad5 100644 --- a/Godeps/_workspace/src/github.com/calmh/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/github.com/calmh/osext/osext_sysctl.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go similarity index 100% rename from Godeps/_workspace/src/github.com/calmh/osext/osext_sysctl.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go diff --git a/Godeps/_workspace/src/github.com/calmh/osext/osext_test.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/calmh/osext/osext_test.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go diff --git a/Godeps/_workspace/src/github.com/calmh/osext/osext_windows.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/calmh/osext/osext_windows.go rename to Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go diff --git a/internal/upgrade/upgrade_common.go b/internal/upgrade/upgrade_common.go index fff0d77fa..e1223df60 100644 --- a/internal/upgrade/upgrade_common.go +++ b/internal/upgrade/upgrade_common.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/calmh/osext" + "github.com/kardianos/osext" ) type Release struct {