This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch feature/support-m1 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 1bf5e8ecfd95988dc33b25e544bdbd6b65322f4e Author: Juan Cabrerizo <[email protected]> AuthorDate: Thu Apr 21 10:14:49 2022 +0200 replaces isMac logic for support new MacOs naming --- .../main/java/org/apache/brooklyn/core/location/BasicOsDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java index 6a62bc0605..294cc0102f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java @@ -34,6 +34,7 @@ public class BasicOsDetails implements OsDetails { final boolean is64bit; // (?i) forces matches to be case insensitive public static final String UNIX_OS_NAME_PATTERNS = "(?i).*linux.*|centos|debian|fedora|gentoo|rhel|slackware|solaris|suse|ubuntu|coreos"; + public static final String MACOS_OS_NAME_PATTERNS = "macOS|Mac OS X"; /** Sets is64Bit according to value of arch parameter. */ public BasicOsDetails(String name, String arch, String version) { @@ -77,7 +78,7 @@ public class BasicOsDetails implements OsDetails { @Override public boolean isMac() { - return getName()!=null && getName().equals(OsNames.MAC_OS_X); + return getName()!=null && Pattern.matches(MACOS_OS_NAME_PATTERNS, getName()); } @Override
