diff --git a/checkin_notes b/checkin_notes index d92b5e8c37..99cd2e96e4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3905,6 +3905,7 @@ Charlie 17 Apr 2006 - Mac: Don't customize name of BOINC Data directory for branding; change "GridRepublic Manager" to "GridRepublic Desktop; make branding script more robust if there is a space in any file or directory name or path. + - Mac: Release scripts automatically update ReadMe version numbers. - Mac: clarify that upgrade warning from older versions applies only to Intel Macs. diff --git a/mac_installer/GR-ReadMe.rtf b/mac_installer/GR-ReadMe.rtf index a52f65c935..d8230e6658 100644 --- a/mac_installer/GR-ReadMe.rtf +++ b/mac_installer/GR-ReadMe.rtf @@ -7,7 +7,7 @@ \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc -\f0\b\fs28 \cf0 Macintosh GridRepublic Desktop Version 5.5.0 Release Notes\ +\f0\b\fs28 \cf0 Macintosh GridRepublic Desktop Version Release Notes\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1\b0\fs24 \cf0 \ diff --git a/mac_installer/ReadMe.rtf b/mac_installer/ReadMe.rtf index d316ef9de0..6866afaeb8 100644 --- a/mac_installer/ReadMe.rtf +++ b/mac_installer/ReadMe.rtf @@ -7,7 +7,7 @@ \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc -\f0\b\fs28 \cf0 Macintosh BOINCManager Version 5.5.50 Release Notes\ +\f0\b\fs28 \cf0 Macintosh BOINCManager Version Release Notes\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1\b0\fs24 \cf0 \ diff --git a/mac_installer/release_GridRepublic.sh b/mac_installer/release_GridRepublic.sh index 88890fc2e6..5f1498ca8b 100644 --- a/mac_installer/release_GridRepublic.sh +++ b/mac_installer/release_GridRepublic.sh @@ -62,6 +62,8 @@ mkdir -p "${IR_PATH}" cp -fp mac_Installer/License.rtf "${IR_PATH}/" cp -fp "${README_FILE}" "${IR_PATH}/ReadMe.rtf" +# Update version number +sed -i "" s/""/"$1.$2.$3"/g "${IR_PATH}/ReadMe.rtf" # Create the installer's preinstall and preupgrade scripts from the standard preinstall script ##### We've decided not to customize BOINC Data directory name for branding @@ -152,7 +154,7 @@ sudo rm -dfR "${NEW_DIR_PATH}/" mkdir -p "${NEW_DIR_PATH}/" mkdir -p "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal" -cp -fp "${README_FILE}" "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ReadMe.rtf" +cp -fp "${IR_PATH}/ReadMe.rtf" "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ReadMe.rtf" sudo chown -R 501:admin "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ReadMe.rtf" sudo chmod -R 755 "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ReadMe.rtf" diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 6bc894207c..27cddb3ea4 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -50,6 +50,9 @@ mkdir -p ../BOINC_Installer/Installer\ Resources/ cp -fp mac_Installer/License.rtf ../BOINC_Installer/Installer\ Resources/ cp -fp mac_installer/ReadMe.rtf ../BOINC_Installer/Installer\ Resources/ +# Update version number +sed -i "" s/""/"$1.$2.$3"/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf + #### We don't customize BOINC Data directory name for branding #### cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/ #### cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/preupgrade @@ -96,7 +99,7 @@ mkdir -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal mkdir -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin mkdir -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables -cp -fp mac_installer/ReadMe.rtf ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal +cp -fp ../BOINC_Installer/Installer\ Resources/ReadMe.rtf ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal sudo chown -R 501:admin ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/ReadMe.rtf sudo chmod -R 755 ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/ReadMe.rtf