From a854461509926079a68bbb62b9d775194884a945 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Wed, 23 Sep 2026 07:50:36 +0200 Subject: [PATCH 1/2] feat: support .pkg extension in /go/download Test-bot: skip --- go/download/_download.php | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/go/download/_download.php b/go/download/_download.php index 5517fef5..46875635 100644 --- a/go/download/_download.php +++ b/go/download/_download.php @@ -1,4 +1,24 @@ [?tier=][&version=] + * + * PRODUCT: kmcomp|keyman-developer|keyman-windows|keyman-mac + * TIER: alpha|beta|stable (default 'stable') + * VERSION: any valid version number (default to latest for tier) + * + * Redirects to the referenced executable, e.g. keyman-18.0.252.dmg for Mac. + * + * This page is referenced by Keyman Developer Server, e.g. + * /go/download/keyman-mac and by Keyman Developer kmc documentation + * /go/download/kmcomp. These paths are rewritten by .htaccess to call into + * _download.php. + */ + require_once _KEYMANCOM_INCLUDES . '/autoload.php'; use Keyman\Site\com\keyman\KeymanComSentry; use Keyman\Site\Common\KeymanHosts; @@ -34,11 +54,15 @@ $MAC_VERSION = $versions->mac->$TIER->version; } + // epic/mac-config changes the mac installer from a .dmg to .pkg, in version 19.0.2xx-alpha + // TODO: update to actual release version + $MAC_FILENAME = version_compare($MAC_VERSION, "19.0.288") >= 0 ? "keyman-$MAC_VERSION.pkg" : "keyman-$MAC_VERSION.dmg"; + $packages = [ "kmcomp" => ["developer", $DEVELOPER_VERSION, "kmcomp-$DEVELOPER_VERSION.zip"], "keyman-developer" => ["developer", $DEVELOPER_VERSION, "keymandeveloper-$DEVELOPER_VERSION.exe"], "keyman-windows" => ["windows", $WINDOWS_VERSION, "keyman-$WINDOWS_VERSION.exe"], - "keyman-mac" => ["mac", $MAC_VERSION, "keyman-$MAC_VERSION.dmg"] + "keyman-mac" => ["mac", $MAC_VERSION, $MAC_FILENAME], ]; if(!isset($packages[$object])) { From c23229e702743c773a6ac67e90542164edac9fe6 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 24 Sep 2026 09:59:17 +0200 Subject: [PATCH 2/2] chore: use 19.0.291-alpha as changeover to .pkg for mac builds --- go/download/_download.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/go/download/_download.php b/go/download/_download.php index 46875635..8fc6d356 100644 --- a/go/download/_download.php +++ b/go/download/_download.php @@ -54,9 +54,8 @@ $MAC_VERSION = $versions->mac->$TIER->version; } - // epic/mac-config changes the mac installer from a .dmg to .pkg, in version 19.0.2xx-alpha - // TODO: update to actual release version - $MAC_FILENAME = version_compare($MAC_VERSION, "19.0.288") >= 0 ? "keyman-$MAC_VERSION.pkg" : "keyman-$MAC_VERSION.dmg"; + // epic/mac-config changes the mac installer from a .dmg to .pkg, in version 19.0.291-alpha + $MAC_FILENAME = version_compare($MAC_VERSION, "19.0.291") >= 0 ? "keyman-$MAC_VERSION.pkg" : "keyman-$MAC_VERSION.dmg"; $packages = [ "kmcomp" => ["developer", $DEVELOPER_VERSION, "kmcomp-$DEVELOPER_VERSION.zip"],