FMS15 detection and OSX installer update.

GoyaPtyLtd · Jun 11, 2016 · ad81683 · ad81683
1 parent adec787
commit ad81683
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+### 4.0.4 (Released 2016-06-11) ###
+- FileMaker Server 15 detection.
+- Update Mac OS X installer for FMS 15.
+
 ### 4.0.3 (Released 2016-05-18) ###
 - Improve SSL instructions in report page.
 

diff --git a/contrib/install-RESTfm.OSX/shared-functions b/contrib/install-RESTfm.OSX/shared-functions
@@ -179,7 +179,7 @@ check_FMSVersion() {
             fi
             log_success_msg "$MSGPREFIX $FMS_VERSION"
             ;;
-        '14')
+        '14'|'15')
             log_success_msg "$MSGPREFIX $FMS_VERSION"
             ;;
         *)

diff --git a/lib/RESTfm/diagnostic_checks.php b/lib/RESTfm/diagnostic_checks.php
@@ -39,7 +39,7 @@
     // Note: Files are carefully selected to capture changes from the
     //       version preceding it.
     $fmsFileMap = array (
-        'FileMaker/Error/sv.php' => '82ac207c77fb95ead1d9fbdcd49c28ff:14',
+        'FileMaker/Error/sv.php' => '82ac207c77fb95ead1d9fbdcd49c28ff:14, 15',
         'FileMaker/Implementation/Command/EditImpl.php' => 'e55064465260f2a4e1c0049abc77e90d:13',
         'FileMaker/Implementation/FileMakerImpl.php' => '344a84eafa71167103dbfa3927f3d13e:12',
         'FileMaker/Implementation/FileMakerImpl.php' => '5a526472505610de33affefc5df92f6a:11',
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,7 +179,7 @@ check_FMSVersion() { @@
                 fi
                 log_success_msg "$MSGPREFIX $FMS_VERSION"
                 ;;
-            '14')
+            '14'|'15')
                 log_success_msg "$MSGPREFIX $FMS_VERSION"
                 ;;
             *)
@@ Expand Down @@