From ca6f895b924e449e8864aba744416982f602af95 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 26 Feb 2021 18:07:30 +0000 Subject: [PATCH] HMBFDHV-560 - Store product variant in meta productinfo --- meta/folder.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index dcce18d..e5adb7e 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -53,14 +53,14 @@ class ProductInfo extends GISJsonSerialised { script.error("The subcomponent name: ${subcomponentname} needs to be renamed as it cannot be used in a git tag name") } if (variant) { - def int sstatus = 0 + def int vstatus = 0 if (script.isUnix()) { - sstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${variant}\" >/dev/null 2>/dev/null", , returnStatus: true) + vstatus = script.sh(script: "git check-ref-format --normalize \"refs/tags/${variant}\" >/dev/null 2>/dev/null", , returnStatus: true) } else { - sstatus = script.bat(script: "@git check-ref-format --normalize \"refs/tags/${variant}\" > NUL 2> NUL", , returnStatus: true) + vstatus = script.bat(script: "@git check-ref-format --normalize \"refs/tags/${variant}\" > NUL 2> NUL", , returnStatus: true) } - if (sstatus > 0) { + if (vstatus > 0) { script.error("The subcomponent name: ${variant} needs to be renamed as it cannot be used in a git tag name") } }