From: Marcio Barbosa <mbarbosa@sinenomine.net>
Date: Fri, 28 Jun 2019 03:40:55 +0000 (-0300)
Subject: macos: packaging support for MacOS X 10.15
X-Git-Tag: upstream/1.8.6_pre1^2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cb6cf0b924b88fcbfb80fea4d832b50b77951692;p=packages%2Fo%2Fopenafs.git

macos: packaging support for MacOS X 10.15

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

Reviewed-on: https://gerrit.openafs.org/13669
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit c7864b73603842b8beaee03fcbb2426890205410)

Change-Id: I0b6b0616f2f2413a466c60986957e6bc3e21cbb0
Reviewed-on: https://gerrit.openafs.org/14034
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Yadavendra Yadav <yadayada@in.ibm.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/packaging/MacOS/InstallationCheck.19 b/src/packaging/MacOS/InstallationCheck.19
new file mode 100644
index 000000000..53d3eb376
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.19
@@ -0,0 +1,19 @@
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 19 ]; 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.19 b/src/packaging/MacOS/InstallationCheck.strings.19
new file mode 100644
index 000000000..ace343b5b
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.strings.19
@@ -0,0 +1 @@
+"16" = "This OpenAFS release requires Catalina (10.15)";
diff --git a/src/packaging/MacOS/ReadMe.rtf.19 b/src/packaging/MacOS/ReadMe.rtf.19
new file mode 100644
index 000000000..a4fb8bd08
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.19
@@ -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.15 (Catalina) 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 d65f585bc..8d97cbf73 100644
--- a/src/packaging/MacOS/pkgbuild.sh.in
+++ b/src/packaging/MacOS/pkgbuild.sh.in
@@ -139,6 +139,10 @@ elif [ x"$majorvers" = x18 ]; then
     RELNAME="Mojave"
     THISREL=14
 
+elif [ x"$majorvers" = x19 ]; then
+    RELNAME="Catalina"
+    THISREL=15
+
 elif [ x"$majorvers" = x ] ; then
     echo "Error running uname" >&2
     exit 1