Make version display consistent

Makefile

@@ -31,7 +31,7 @@ build: clean deps
 	@cd cmd/$(CLIENT) && \
 		go build -tags $(BUILD_TAGS) -installsuffix netgo \
 		-ldflags $(BUILD_LDFLAGS) .
-	@echo "Built $$(./cmd/$(CLIENT)/$(CLIENT) -v)"
+	@echo "Built $$(./cmd/$(CLIENT)/$(CLIENT) --version)"
 
 image:
 	@docker build --build-arg TAG=$(TAG) --build-arg BUILD=$(BUILD) -t $(REPO):$(TAG) .

cmd/msgbusd/main.go

@@ -27,12 +27,12 @@ func main() {
 	flag.Parse()
 
 	if version {
-		fmt.Printf(msgbus.FullVersion())
+		fmt.Printf("msgbusd %s", msgbus.FullVersion())
 		os.Exit(0)
 	}
 
 	options := msgbus.Options{DefaultTTL: ttl}
 	http.Handle("/", msgbus.NewMessageBus(&options))
-	log.Printf("%s listening on %s", msgbus.Package, bind)
+	log.Printf("msgbusd %s listening on %s", msgbus.FullVersion(), bind)
 	log.Fatal(http.ListenAndServe(bind, nil))
 }

version.go

@@ -5,9 +5,6 @@ import (
 )
 
 var (
-	//Package package name
-	Package = "msgbus"
-
 	// Version release version
 	Version = "0.1.0"
 
@@ -18,7 +15,7 @@ var (
 	GitCommit = "HEAD"
 )
 
-// FullVersion display the full version, build and commit hash
+// FullVersion returns the full version, build and commit hash
 func FullVersion() string {
-	return fmt.Sprintf("%s-%s-%s@%s", Package, Version, Build, GitCommit)
+	return fmt.Sprintf("%s-%s@%s", Version, Build, GitCommit)
 }