diff --git a/CHANGELOG b/CHANGELOG index e7d5cc2..3f0dcfb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +### 4.0.5 (Released 2016-07-27) ### +- Update Mac OS X installer for installation on worker machine of a two + machine deployment. + ### 4.0.4 (Released 2016-06-12) ### - FileMaker Server 15 detection. - Update Mac OS X installer for FMS 15. diff --git a/contrib/install-RESTfm.OSX/shared-functions b/contrib/install-RESTfm.OSX/shared-functions index 1547e6c..9cba0f0 100644 --- a/contrib/install-RESTfm.OSX/shared-functions +++ b/contrib/install-RESTfm.OSX/shared-functions @@ -157,8 +157,7 @@ check_FMSVersion() { local MSGPREFIX='Check FMS version: ' local FMSADMIN_EXE='/Library/FileMaker Server/Database Server/bin/fmsadmin' - local FMSVERSION_JAR='/Library/FileMaker Server/Admin/admin-server/WEB-INF/lib/fmversion.jar' - local FMS_SERVER_CONFIG='/Library/FileMaker Server/Admin/conf/server_config.xml' + local FMSVERSION_JAR='/Library/FileMaker Server/Admin/admin-helper/WEB-INF/lib/fmversion.jar' # Ensure that FMS is installed on this system. if [ ! -r "$FMSADMIN_EXE" ]; then @@ -197,6 +196,7 @@ check_FMS_WPE_PHP() { local MSGPREFIX='Check FMS WPE and PHP: ' # Ensure that both WPE and PHP are enabled (only works on FMS14) + #local FMS_SERVER_CONFIG='/Library/FileMaker Server/Admin/conf/server_config.xml' #local FMSWPEPHP='' #FMSWPEPHP=`xpath "$FMS_SERVER_CONFIG" '//component[@name="WPE"]//technology[@name="PHP"]//parameter[@name="enabled"]/text()' 2>/dev/null` #if [ "X${FMSWPEPHP}" != 'Xtrue' ]; then diff --git a/lib/RESTfm/Version.php b/lib/RESTfm/Version.php index aa565ac..dd46634 100644 --- a/lib/RESTfm/Version.php +++ b/lib/RESTfm/Version.php @@ -21,7 +21,7 @@ * Version static class to hold release version. */ class Version { - private static $_release = '4.0.4'; + private static $_release = '4.0.5'; private static $_revision = '%%REVISION%%'; private static $_protocol = '5'; // Bump this when REST API changes.