From f0c6a480cd1aae72bcb55fedb42e60b83aecce58 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Sun, 24 Mar 2019 00:43:36 +0100
Subject: [PATCH] build: refactoring

---
 .circleci/config.yml |  2 +-
 build.go             | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3f7930221d..f39e94ce3a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,7 +342,7 @@ jobs:
           name: Deploy to grafana.com
           command: |
             cd enterprise-dist
-            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "$(cat grafana.version)"' --nightly
+            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "$(cat grafana.version)" --nightly
 
 
   deploy-enterprise-release:
diff --git a/build.go b/build.go
index 83eb2fcf041..c92b3e69ee7 100644
--- a/build.go
+++ b/build.go
@@ -421,13 +421,17 @@ func grunt(params ...string) {
 	}
 }
 
+func genPackageVersion() string {
+	if includeBuildId {
+		return fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
+	} else {
+		return version
+	}
+}
+
 func gruntBuildArg(task string) []string {
 	args := []string{task}
-	if includeBuildId {
-		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
-	} else {
-		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
-	}
+	args = append(args, fmt.Sprintf("--pkgVer=%v", genPackageVersion()))
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
 	}
@@ -449,13 +453,7 @@ func setup() {
 }
 
 func printGeneratedVersion() {
-	var genVersion string
-	if includeBuildId {
-		genVersion = fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
-	} else {
-		genVersion = version
-	}
-	fmt.Print(genVersion)
+	fmt.Print(genPackageVersion())
 }
 
 func test(pkg string) {