From: Marcio Barbosa <mbarbosa@sinenomine.net>
Date: Sun, 30 Sep 2018 21:38:53 +0000 (-0400)
Subject: macos: packaging support for MacOS X 10.14
X-Git-Tag: openafs-devel-1_9_0~411
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=2aeabf8c5bca22b400653e2bc88b6f36d47b05ca

macos: packaging support for MacOS X 10.14

This commit introduces the new set of changes / files required to
successfully create the dmg installer on OS X 10.14 "Mojave".

Change-Id: Ia1238b454350777bbfbf3dfd2be0c6c523348928
Reviewed-on: https://gerrit.openafs.org/13349
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---

diff --git a/src/packaging/MacOS/InstallationCheck.18 b/src/packaging/MacOS/InstallationCheck.18
new file mode 100644
index 0000000..485a63b
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.18
@@ -0,0 +1,19 @@
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 18 ]; then
+	exit 112
+fi
+
+# check for temporary versions of ThisCell and CellAlias
+# and move them aside
+tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER
+tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER
+date=`date +%Y%m%d%H%M`
+if [ -e $tmpthiscell ]; then
+    mv -f $tmpthiscell $tmpthiscell.$date
+fi
+if [ -e $tmpcellalias ]; then
+    mv -f $tmpcellalias $tmpcellalias.$date
+fi
+
+exit 0
diff --git a/src/packaging/MacOS/InstallationCheck.strings.18 b/src/packaging/MacOS/InstallationCheck.strings.18
new file mode 100644
index 0000000..f4df0dd
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.strings.18
@@ -0,0 +1 @@
+"16" = "This OpenAFS release requires Mojave (10.14)";
diff --git a/src/packaging/MacOS/ReadMe.rtf.18 b/src/packaging/MacOS/ReadMe.rtf.18
new file mode 100644
index 0000000..bea7c1c
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.18
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.14 (Mojave) and is not recommended for use with any other version.}
diff --git a/src/packaging/MacOS/pkgbuild.sh.in b/src/packaging/MacOS/pkgbuild.sh.in
index 2a3f4a0..3570d7a 100644
--- a/src/packaging/MacOS/pkgbuild.sh.in
+++ b/src/packaging/MacOS/pkgbuild.sh.in
@@ -135,6 +135,10 @@ elif [ x"$majorvers" = x17 ]; then
     RELNAME="HighSierra"
     THISREL=13
 
+elif [ x"$majorvers" = x18 ]; then
+    RELNAME="Mojave"
+    THISREL=14
+
 elif [ x"$majorvers" = x ] ; then
     echo "Error running uname" >&2
     exit 1