Get proper $*DISTRO info for Mac OS X

rakudo · May 28, 2014 · 3438956 · 3438956
1 parent 0a70378
commit 3438956
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/core/Distro.pm b/src/core/Distro.pm
@@ -7,8 +7,9 @@ class Distro does Systemic{
     has Bool $.is-win;
     has Str $.release;
 
-    submethod BUILD (:$name, :$version) {
-        $!name    = $name.lc;
+    submethod BUILD (:$name, :$version, :$!release) {
+        $!name = $name.lc;    # lowercase
+        $!name ~~ s:g/" "//;  # spaceless
         $!auth    = "unknown";
         $!version = Version.new($version);
         $!is-win  = so $!name eq any <mswin32 mingw msys cygwin>;
@@ -44,9 +45,24 @@ class Distro does Systemic{
 #?if !jvm
       $*VM.config<osvers>;
 #?endif
+    my Str $release;
+
+    # darwin specific info
+    if $name eq 'darwin' {
+        if qx/sw_vers/ ~~ m/ProductName\: \s+ (<[\w\ ]>+) \s+ ProductVersion\: \s+ (<[\d\.]>+) \s+ BuildVersion\: \s+ (<[\w\d]>+)/ {
+            $name    = ~$0;
+            $version = ~$1;
+            $release = ~$2;
+        }
+        else {
+            $name = 'Mac OS X'; # we assume
+            $version = "unknown";
+            $release = "unknown";
+        }
+    }
 
     # set up $*DISTRO and deprecated $*OS and $*OSVER
-    PROCESS::<$DISTRO> = Distro.new( :$name, :$version );
+    PROCESS::<$DISTRO> = Distro.new( :$name, :$version, :$release );
     PROCESS::<$OS> = Deprecation.obsolete(
       :name('$*OS'),
       :value($name),

diff --git a/src/core/Kernel.pm b/src/core/Kernel.pm
@@ -13,8 +13,8 @@ class Kernel does Systemic {
     method name {
         $!name //= do {
             given $*DISTRO.name {
-                when any <linux darwin> { # needs adapting
-                    qx/uname -s/.chomp;
+                when any <linux macosx> { # needs adapting
+                    qx/uname -s/.chomp.lc;
                 }
                 default {
                     "unknown";
@@ -26,7 +26,7 @@ class Kernel does Systemic {
     method version {
         $!version //= Version.new( do {
             given $*DISTRO.name {
-                when any <linux darwin> { # needs adapting
+                when any <linux macosx> { # needs adapting
                     qx/uname -v/.chomp;
                 }
                 default {
@@ -39,7 +39,7 @@ class Kernel does Systemic {
     method hardware {
         $!hardware //= do {
             given $*DISTRO.name {
-                when any <linux darwin> { # needs adapting
+                when any <linux macosx> { # needs adapting
                     qx/uname -m/.chomp;
                 }
                 default {
@@ -52,7 +52,7 @@ class Kernel does Systemic {
     method arch {
         $!arch //= do {
             given $*DISTRO.name {
-                when any <linux darwin> { # needs adapting
+                when any <linux macosx> { # needs adapting
                     qx/uname -p/.chomp;
                 }
                 default {