From 8a442f4ccebe153136b5d34ee654b6ab85f7eb14 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 2 Feb 2010 15:59:12 +0000 Subject: [PATCH] Add a set of strings for the InstallationCheck InstallationCheck needs a strings dictionary to turn its errors into human readable content. Add such a dictionary, and use the correct product name and version for each Mac OS X release. FIXES 126322 Change-Id: I8401a1163ea078e690152215c20db6970969ee04 Reviewed-on: http://gerrit.openafs.org/1208 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 7533adaf34ef76324b971a211bcbf3fba5b40627) Reviewed-on: http://gerrit.openafs.org/1215 --- src/packaging/MacOS/InstallationCheck.strings | 1 - src/packaging/MacOS/InstallationCheck.strings.10 | 1 + src/packaging/MacOS/InstallationCheck.strings.8 | 1 + src/packaging/MacOS/InstallationCheck.strings.9 | 1 + src/packaging/MacOS/buildpkg.sh.in | 7 ++++--- 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 src/packaging/MacOS/InstallationCheck.strings create mode 100644 src/packaging/MacOS/InstallationCheck.strings.10 create mode 100644 src/packaging/MacOS/InstallationCheck.strings.8 create mode 100644 src/packaging/MacOS/InstallationCheck.strings.9 diff --git a/src/packaging/MacOS/InstallationCheck.strings b/src/packaging/MacOS/InstallationCheck.strings deleted file mode 100644 index 62d12c1bc..000000000 --- a/src/packaging/MacOS/InstallationCheck.strings +++ /dev/null @@ -1 +0,0 @@ -"16" = "This OpenAFS release requires Tiger (10.4)" diff --git a/src/packaging/MacOS/InstallationCheck.strings.10 b/src/packaging/MacOS/InstallationCheck.strings.10 new file mode 100644 index 000000000..d0bdca19f --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings.10 @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Snow Leopard (10.6)"; diff --git a/src/packaging/MacOS/InstallationCheck.strings.8 b/src/packaging/MacOS/InstallationCheck.strings.8 new file mode 100644 index 000000000..33cd98e69 --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings.8 @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Tiger (10.4)"; diff --git a/src/packaging/MacOS/InstallationCheck.strings.9 b/src/packaging/MacOS/InstallationCheck.strings.9 new file mode 100644 index 000000000..07c075c04 --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings.9 @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Leopard (10.5)"; diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in index ae98ca759..59030601b 100644 --- a/src/packaging/MacOS/buildpkg.sh.in +++ b/src/packaging/MacOS/buildpkg.sh.in @@ -210,9 +210,10 @@ if [ $secondpass = yes ]; then mkdir $DPKGRES cp License.rtf $DPKGRES cp InstallationCheck.$majorvers $DPKGRES/InstallationCheck - mkdir -p $DPKGRES/English.lproj - cp InstallationCheck.$majorvers $DPKGRES/English.lproj/InstallationCheck chmod a+x $DPKGRES/InstallationCheck + mkdir -p $DPKGRES/English.lproj + cp InstallationCheck.strings.$majorvers \ + $DPKGRES/English.lproj/InstallationCheck.strings cp background.jpg $DPKGRES/background.jpg chown -R root${SEP}wheel $DPKGRES rm -rf $CURDIR/OpenAFS-debug-extension.pkg @@ -231,7 +232,7 @@ if [ $secondpass = yes ]; then if [ $majorvers -ge 8 ]; then cp InstallationCheck.$majorvers $PKGRES/InstallationCheck mkdir -p $PKGRES/English.lproj - cp InstallationCheck.$majorvers $PKGRES/English.lproj/InstallationCheck + cp InstallationCheck.strings.$majorvers $PKGRES/English.lproj/InstallationCheck.strings chmod a+x $PKGRES/InstallationCheck fi chmod a+x $PKGRES/postinstall $PKGRES/postupgrade $PKGRES/preupgrade -- 2.39.5