diff --git a/CHANGELOG b/CHANGELOG index d1af14e..302d9cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +### 5.0.1 (Released 2017-12-23) ### + - Update macOS (Mac OS X) installer to identify OS version 10.13 (High Sierra) + ### 5.0.0 (Released 2017-08-21) ### - Update diagnostics report for FMS 16. - Update Mac OS X installer for FMS 16. diff --git a/contrib/install-RESTfm.OSX/shared-functions b/contrib/install-RESTfm.OSX/shared-functions index 2696242..4913da9 100644 --- a/contrib/install-RESTfm.OSX/shared-functions +++ b/contrib/install-RESTfm.OSX/shared-functions @@ -106,13 +106,13 @@ setup_Traps () { # - that we are on a supported version of Mac OS X. # - that we are not running on Mac OS X Server Edition. check_OSXVersion() { - local MSGPREFIX='Check Mac OS X version: ' + local MSGPREFIX='Check macOS (Mac OS X) version: ' # Ensure we have sw_vers, and we are Mac OS X. local PRODUCTNAME='' [ -x "`which sw_vers`" ] && PRODUCTNAME=`sw_vers -productName` if [ "$PRODUCTNAME" != 'Mac OS X' ]; then - log_failure_msg "$MSGPREFIX Mac OS X not detected" + log_failure_msg "$MSGPREFIX macOS (Mac OS X) not detected" exit 1 fi @@ -121,6 +121,9 @@ check_OSXVersion() { # Trim off any patch version, e.g. 10.10.1 -> 10.10 OSXVERSION=`echo "${OSXVERSION}" | grep -Eo '^[0-9]+\.[0-9]+'` case "$OSXVERSION" in + "10.13") + log_success_msg "$MSGPREFIX $OSXVERSION High Sierra" + ;; "10.12") log_success_msg "$MSGPREFIX $OSXVERSION Sierra" ;; diff --git a/lib/RESTfm/Diagnostics.php b/lib/RESTfm/Diagnostics.php index befcf92..22a2dbe 100644 --- a/lib/RESTfm/Diagnostics.php +++ b/lib/RESTfm/Diagnostics.php @@ -751,7 +751,7 @@ private function _darwinFMS13AllowOverrideInstructions() { * (Apple OSX) */ private function _darwinFMS13InstallerInstructions() { - $s = "\nFileMaker Server 13/14/15/16 on Apple OSX instructions:\n\n"; + $s = "\nFileMaker Server 13/14/15/16 on Apple macOS (OS X) instructions:\n\n"; if (strcasecmp(dirname($this->_RESTfmDocumentRoot), '/Library/FileMaker Server/HTTPServer/htdocs') != 0) { $s .= '* Custom document root outside of FMS detected. Please contact Goya support: http://www.restfm.com/help' . "\n"; diff --git a/lib/RESTfm/Version.php b/lib/RESTfm/Version.php index 82abefa..fbe4b46 100644 --- a/lib/RESTfm/Version.php +++ b/lib/RESTfm/Version.php @@ -23,7 +23,7 @@ * Version static class to hold release version. */ class Version { - private static $_release = '5.0.0'; + private static $_release = '5.0.1'; private static $_revision = '%%REVISION%%'; private static $_protocol = '6'; // Bump this when REST API changes.