[commit: ghc] wip/jenkins: Fix tarName (63f0e16)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/63f0e168dbd6a76da8dce4f4a528da400f37ec54/ghc

>---------------------------------------------------------------

commit 63f0e168dbd6a76da8dce4f4a528da400f37ec54
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jun 3 21:33:12 2017 -0400

    Fix tarName


>---------------------------------------------------------------

63f0e168dbd6a76da8dce4f4a528da400f37ec54
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b40186c..830afd1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -156,14 +156,13 @@ def buildGhc(params) {
     sh "${makeCmd} binary-dist"
     def json = new JSONObject()
     def tarPath = getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP')
-    def tarName = sh "basename ${tarPath}"
+    def tarName = sh(script: "basename ${tarPath}", returnStdout: true)
     json.put('commit', resolveCommitSha('HEAD'))
     json.put('tarName', tarName)
     json.put('dirName', getMakeValue(makeCmd, 'BIN_DIST_NAME'))
     json.put('ghcVersion', getMakeValue(makeCmd, 'ProjectVersion'))
     json.put('targetPlatform', getMakeValue(makeCmd, 'TARGETPLATFORM'))
     echo "${json}"
-    echo json.toString()
     writeJSON(file: 'bindist.json', json: json)
     // Write a file so we can easily file the tarball and bindist directory later
     stash(name: "bindist-${targetTriple}", includes: "bindist.json,${tarName}")