From 66082496ba822a5d2883823f745b97cc4e54a89b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 3 Dec 2018 08:48:11 +0000 Subject: [PATCH] Add bat variant of git commands --- versionnumbering/generate.groovy | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index f80d021..ae7e5f4 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -10,42 +10,35 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { def String remoteinfo def String remoteurl dir( gitrootpath) { - def int changecount + def int changecount = 0 if (isUnix()) { changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim().toInteger() } else { - def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() - changecount = stdout.readLines()[1] as int - } + changecount = bat(returnStdout: true, script: "@git rev-list HEAD --count").trim().toInteger() + } echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" - if (isUnix()) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() } else { - def stdout = bat(returnStdout:true , script: "git rev-parse HEAD").trim() - gitrevision = stdout.readLines()[1] + gitrevision = bat(returnStdout: true, script: "@git rev-parse HEAD").trim() } echo "Revision: ${gitrevision}" - if (isUnix()) { remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() } else { - def stdout = bat(returnStdout:true , script: "git remote show origin").trim() - remoteinfo = stdout.readLines()[1..-1] + remoteinfo = bat(returnStdout: true, script: "@git remote show origin").trim() } echo "Remote info: ${remoteinfo}" - if (isUnix()) { remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() } else { - def stdout = bat(returnStdout:true , script: "git config --get remote.origin.url").trim() - remoteurl = stdout.readLines()[1] + remoteurl = bat(returnStdout: true, script: "@git config --get remote.origin.url").trim() } echo "Remote URL: ${remoteurl}" }