commit 0ff574003250ce4e7d31b520a5acfc42713e0285
author Eric Poirier <eric.poirier@eclipse-foundation.org> Mon Oct 26 08:51:00 2020 -0400
committer Eric Poirier <eric.poirier@eclipse-foundation.org> Mon Oct 26 09:15:55 2020 -0400
tree 0a3853c51a84e9e0687243990584b2ea06c248bd
parent c2979f6e04a6b3e2a0ada80803ef44ee7b8f9420

Bug 568218 - Use correct name for macOS

Change-Id: I83a552a8b6448d305266ebe6b08b442bf0c0b3ca
Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>

classes/downloads/comparePackages.class.php

diff --git a/classes/downloads/comparePackages.class.php b/classes/downloads/comparePackages.class.php
index 5eaaf6b..a26c5ef 100644
--- a/classes/downloads/comparePackages.class.php
+++ b/classes/downloads/comparePackages.class.php
@@ -121,11 +121,11 @@
       $this->updatePackages($this->prefix_package . "Linux.xml");
     }
     elseif ($od == "macosx" || $od == "cocoa64") {
-      $this->display = "Mac OS X";
+      $this->display = "macOS";
       $this->updatePackages($this->prefix_package . "Cocoa.xml");
     }
     elseif ($od == "carbon") {
-      $this->display = "Mac OS X";
+      $this->display = "macOS";
       $this->updatePackages($this->prefix_package . "Carbon.xml");
     }
     else {
@@ -325,8 +325,8 @@
       'shortname' => 'Linux'
     );
     $this->platform['macosx'] = array(
-      'name' => 'Mac OS X (Cocoa)',
-      'shortname' => 'Mac OS X'
+      'name' => 'macOS',
+      'shortname' => 'macOS'
     );
   }
 }

classes/downloads/eclipseInstaller.php

diff --git a/classes/downloads/eclipseInstaller.php b/classes/downloads/eclipseInstaller.php
index 8d03ab2..edf61de 100644
--- a/classes/downloads/eclipseInstaller.php
+++ b/classes/downloads/eclipseInstaller.php
@@ -39,7 +39,7 @@
    */
   function __construct($release = 'latest') {
     parent::__construct();
-    $this->_addPlaform('Mac OS X');
+    $this->_addPlaform('macOS');
     $this->_addPlaform('Windows');
     $this->_addPlaform('Linux');
 
@@ -377,7 +377,7 @@
     $eclipse_env = $this->getEclipseEnv();
 
     if (!empty($data['files']['mac64'])) {
-      $this->addlink('Mac OS X', str_replace('www.eclipse.org', $eclipse_env['domain'], $data['files']['mac64']['url']), "64 bit", $data['files']['mac64']['jre']);
+      $this->addlink('macOS', str_replace('www.eclipse.org', $eclipse_env['domain'], $data['files']['mac64']['url']), "64 bit", $data['files']['mac64']['jre']);
     }
 
     if (!empty($data['files']['win32'])) {