From abfa51a64f479376da4ebb122a2f80f6fb00d76f Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Thu, 12 May 2016 14:45:11 +0100 Subject: [PATCH 1/2] Fix Unbound variable Signed-off-by: Mihaela Stoica --- Branding/branding.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Branding/branding.sh b/Branding/branding.sh index 74b5de977..379a99718 100755 --- a/Branding/branding.sh +++ b/Branding/branding.sh @@ -23,7 +23,7 @@ BRANDING_SERVER=XenServer BRANDING_BRAND_CONSOLE=$(cat ${SCRATCH_DIR}/globals | grep -w BRAND_CONSOLE | sed -e 's/BRAND_CONSOLE=//g' -e 's/"//g') # Check for the micro version override from declarations.sh and use it if present otherwise use the one from branding if [ -n "${PRODUCT_MICRO_VERSION_OVERRIDE+x}" ]; then - BRANDING_PRODUCT_MICRO_VERSION=$BRANDING_PRODUCT_MICRO_VERSION_OVERRIDE + BRANDING_PRODUCT_MICRO_VERSION=$PRODUCT_MICRO_VERSION_OVERRIDE echo Using override for micro product number of: $BRANDING_PRODUCT_MICRO_VERSION else BRANDING_PRODUCT_MICRO_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MICRO_VERSION | sed -e 's/PRODUCT_MICRO_VERSION=//g' -e 's/"//g') From ed393b5800356539342469b1ef4c389a5a81c77f Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Fri, 13 May 2016 00:35:58 +0100 Subject: [PATCH 2/2] Fix re-branding of the product version Signed-off-by: Mihaela Stoica --- mk/re-branding.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/re-branding.sh b/mk/re-branding.sh index 39f795b6d..2b7047cd6 100755 --- a/mk/re-branding.sh +++ b/mk/re-branding.sh @@ -59,7 +59,7 @@ rebranding_global() -e "s#\"\[BRANDING_COPYRIGHT\]\"#${BRANDING_COPYRIGHT}#g" \ -e "s#\"\[BRANDING_COPYRIGHT_2\]\"#${BRANDING_COPYRIGHT_2}#g" \ -e "s#\[XenServer product\]#${BRANDING_PRODUCT_BRAND}#g" \ - -e "s#\[BRANDING_PRODUCT_VERSION\]#${BRANDING_PRODUCT_VERSION}#g" \ + -e "s#\[BRANDING_PRODUCT_VERSION\]#${BRANDING_XC_PRODUCT_VERSION}#g" \ -e "s#\[BRANDING_PRODUCT_VERSION_TEXT\]#${BRANDING_PRODUCT_VERSION_TEXT}#g" \ -e "s#\[xensearch\]#${BRANDING_SEARCH}#g" \ -e "s#\[xsupdate\]#${BRANDING_UPDATE}#g" \