From: Marcio Barbosa <mbarbosa@sinenomine.net>
Date: Fri, 6 Oct 2017 13:01:12 +0000 (-0300)
Subject: macos: packaging support for MacOS X 10.13
X-Git-Tag: upstream/1.8.0_pre4^3~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5857724bf60e7706bcefde63d8fa0c7b2119e662;p=packages%2Fo%2Fopenafs.git

macos: packaging support for MacOS X 10.13

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

Reviewed-on: https://gerrit.openafs.org/12742
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit e533d0737058940d59d93467c9b4d6d3ec2834e6)

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

diff --git a/src/packaging/MacOS/InstallationCheck.17 b/src/packaging/MacOS/InstallationCheck.17
new file mode 100644
index 000000000..805f5a870
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.17
@@ -0,0 +1,19 @@
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 17 ]; 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.17 b/src/packaging/MacOS/InstallationCheck.strings.17
new file mode 100644
index 000000000..bee2ab1f6
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.strings.17
@@ -0,0 +1 @@
+"16" = "This OpenAFS release requires High Sierra (10.13)";
diff --git a/src/packaging/MacOS/ReadMe.rtf.17 b/src/packaging/MacOS/ReadMe.rtf.17
new file mode 100644
index 000000000..94181b6a1
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.17
@@ -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.13 (High Sierra) 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 36ec5d2d2..2a3f4a048 100644
--- a/src/packaging/MacOS/pkgbuild.sh.in
+++ b/src/packaging/MacOS/pkgbuild.sh.in
@@ -131,6 +131,10 @@ elif [ x"$majorvers" = x16 ]; then
     RELNAME="Sierra"
     THISREL=12
 
+elif [ x"$majorvers" = x17 ]; then
+    RELNAME="HighSierra"
+    THISREL=13
+
 elif [ x"$majorvers" = x ] ; then
     echo "Error running uname" >&2
     exit 1