From 0a14eb58b20e2118eae4fdf0bf33d62c5a73101f Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Wed, 24 Dec 2014 11:12:14 +0000 Subject: [PATCH] Don't hardwire executable names; use logical names instead We could use `os.Args[0]` instead of hardwired names, but that ends up being e.g. `/home/weave/weaver`. So, use logical names instead. --- weavedns/main.go | 2 +- weaver/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/weavedns/main.go b/weavedns/main.go index 1185dc75..ab5ecbd4 100644 --- a/weavedns/main.go +++ b/weavedns/main.go @@ -36,7 +36,7 @@ func main() { flag.Parse() if justVersion { - io.WriteString(os.Stdout, fmt.Sprintf("weavedns %s\n", version)) + io.WriteString(os.Stdout, fmt.Sprintf("weave DNS %s\n", version)) os.Exit(0) } diff --git a/weaver/main.go b/weaver/main.go index c28b9bb9..ac24973d 100644 --- a/weaver/main.go +++ b/weaver/main.go @@ -59,7 +59,7 @@ func main() { peers = flag.Args() if justVersion { - io.WriteString(os.Stdout, fmt.Sprintf("weaver %s\n", version)) + io.WriteString(os.Stdout, fmt.Sprintf("weave router %s\n", version)) os.Exit(0) } @@ -136,7 +136,7 @@ func main() { func handleHttp(router *weave.Router) { http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) { - io.WriteString(w, fmt.Sprintln("weaver version", version)) + io.WriteString(w, fmt.Sprintln("weave router", version)) io.WriteString(w, router.Status()) }) http.HandleFunc("/connect", func(w http.ResponseWriter, r *http.Request) {