From 75c7e069cccc27681245dfe06428a507cb9675be Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 31 Oct 2018 20:28:30 +0000 Subject: [PATCH] Format metaversion output --- versionnumbering/metaversion.gsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh index 911e094..d296fca 100644 --- a/versionnumbering/metaversion.gsh +++ b/versionnumbering/metaversion.gsh @@ -28,27 +28,27 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = if (fileExists("${differencesFile}")) { currentContents = readFile file: "${OF}/differences.txt" newContents = readFile file: "${differencesFile}" - writeFile file: "${OF}/differences.txt", text: currentContents + "${differencesFile}: \n" + newContents + breakline = "***********************************************************************\n" + writeFile file: "${OF}/differences.txt", text: currentContents + breakline + "${differencesFile}: \n" + newContents } buildStampFile = "${versionFolder}/buildstamp.txt" - buildStampFileContents = readFile "${buildStampFile}" + buildStampFileContents = readFile("${buildStampFile}").trim() remoteurlFile = "${versionFolder}/remoteurl.txt" if (fileExists("${remoteurlFile}")) { - remoteurlFileContents = readFile "${remoteurlFile}" + remoteurlFileContents = readFile("${remoteurlFile}").trim() } else { remoteurlFileContents = 'Unknown' } gitRevisionFile = "${versionFolder}/gitrevision.txt" - gitRevisionFileContents = readFile "${gitRevisionFile}" + gitRevisionFileContents = readFile("${gitRevisionFile}").trim() metabuildStampFile = "${OF}/buildstamps.txt" - metabuildStampFileContents = readFile "${metabuildStampFile}" + metabuildStampFileContents = readFile("${metabuildStampFile}") writeFile file: "${metabuildStampFile}", text: metabuildStampFileContents + "\r\n" + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents - revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}"