Update Build Script to reflect correct agent version

LLNL · Oct 15, 2018 · 3adf8d7 · 3adf8d7
1 parent c459b2b
commit 3adf8d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Packages/Combined/Resources/Welcome.rtf b/Packages/Combined/Resources/Welcome.rtf
@@ -1,14 +1,14 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf100
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf100
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;\red255\green0\blue0;}
 {\*\expandedcolortbl;;\csgenericrgb\c100000\c0\c0;}
 \margl1440\margr1440\vieww20220\viewh13880\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
-\f0\b\fs36 \cf0 MacPatch v3.1.0 Agent Installer \cf2 [STATE]\cf0 \
+\f0\b\fs36 \cf0 MacPatch v[AGENT_VER] Agent Installer \cf2 [STATE]\cf0 \
 \
 [BUILD_NO]\
 \
 
-\b0\fs28 System Requirements:\
+\f1\b0\fs28 System Requirements:\
 Mac OS X 10.10 or higher Intel Only}
diff --git a/scripts/MPBuildClient.sh b/scripts/MPBuildClient.sh
@@ -382,6 +382,8 @@ ${BUILDROOT}/Combined/Packages/Updater.pkg
 
 
 BUILD_NO_STR=`date +%Y%m%d-%H%M%S`
+AGENT_VER_BUILD="$AGENT_VER.$BUILD_NO"
+sed -i '' "s/\[AGENT_VER\]/$AGENT_VER_BUILD/g" "${BUILDROOT}/Combined/Resources/Welcome.rtf"
 sed -i '' "s/\[BUILD_NO\]/$BUILD_NO_STR/g" "${BUILDROOT}/Combined/Resources/Welcome.rtf"
 sed -i '' "s/\[STATE\]/$PKG_STATE/g" "${BUILDROOT}/Combined/Resources/Welcome.rtf"