Merge pull request #8 from ifad/goreleaser

Goreleaser

Author: vjt

.gitignore

@@ -1,4 +1,5 @@
 bin/*
+dist/*
 pkg/*
 src/gopkg.in/*
 src/github.com/*

.travis.yml

@@ -1,6 +1,5 @@
 go:
-  - 1.5
-  - 1.6
+  - 1.8
 
 language: go
 
@@ -9,3 +8,6 @@ install:
 
 script:
   - make test
+
+after_success:
+  test -n "$TRAVIS_TAG" && make release

Makefile

@@ -24,3 +24,6 @@ gcfg:
 
 testify:
 	[ -d src/gopkg.in/testify.v1 ] || go get gopkg.in/stretchr/testify.v1
+
+release:
+	curl -sL https://git.io/goreleaser | bash

goreleaser.yml

@@ -0,0 +1,9 @@
+build:
+  main: clammit
+  binary_name: clammit
+  goos:
+    - linux
+  goarch:
+    - amd64
+    - arm
+    - arm64

src/clammit/main.go

@@ -27,6 +27,11 @@ import (
 	"syscall"
 )
 
+/* This is for Go Releaser.
+ * https://github.com/goreleaser/goreleaser#a-note-about-mainversion
+ */
+var version = "master"
+
 //
 // Configuration structure, designed for gcfg
 //
@@ -114,9 +119,10 @@ type Ctx struct {
 // JSON server information response
 //
 type Info struct {
+	Version             string `json:"clammit_version"`
 	Address             string `json:"scan_server_url"`
 	PingResult          string `json:"ping_result"`
-	Version             string `json:"version"`
+	ScannerVersion      string `json:"scan_server_version"`
 	TestScanVirusResult string `json:"test_scan_virus"`
 	TestScanCleanResult string `json:"test_scan_clean"`
 }
@@ -354,16 +360,17 @@ func infoHandler(w http.ResponseWriter, req *http.Request) {
 
 	info := &Info{
 		Address: ctx.Scanner.Address(),
+		Version: version,
 	}
 	if err := ctx.Scanner.Ping(); err != nil {
 		info.PingResult = err.Error()
 	} else {
 		info.PingResult = "Connected to server OK"
 		if response, err := ctx.Scanner.Version(); err != nil {
-			info.Version = err.Error()
+			info.ScannerVersion = err.Error()
 		} else {
 			for s := range response {
-				info.Version += s
+				info.ScannerVersion += s
 			}
 		}
 		/*