Changeset 34524 for other-projects/nightly-tasks

Timestamp:

2020-11-05T00:13:31+13:00 (3 years ago)

Author:

ak19

Message:

Correct Mac OS name in log file being uploaded

File:

• other-projects/nightly-tasks/snapshot/trunk/task.pl (modified) (1 diff)

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -24 +24 @@
     #$osversion=`uname -r | sed 's/\..*$//'`;
     $osversion=`uname -r`; #$osversion =~ s@\..*$@@; 
-    $osversion = ($osversion =~ m@^1[1-9]@i) ? "-Lion" : "";
+    #$osversion = ($osversion =~ m@^1[1-9]@i) ? "-Lion" : "";
+
+    # e.g. https://en.wikipedia.org/wiki/MacOS_Mojave has darwin kernel version 18.7.0  
+    # uname -r returns the major number. 18 in Mojave's example
+    if($osversion =~ m@^11@i) {
+        $osversion = "-Lion";
+    } elsif($osversion =~ m@^12@i) {
+        $osversion = "-Mountain-Lion";
+    } elsif($osversion =~ m@^13@i) {
+        $osversion = "-Mavericks"; # official name is not Maverick but Mavericks
+    } elsif($osversion =~ m@^14@i) {
+        $osversion = "-Yosemite";
+    } elsif($osversion =~ m@^15@i) {
+        $osversion = "-ElCapitan";
+    } elsif($osversion =~ m@^16@i) {
+        $osversion = "-Sierra";
+    } elsif($osversion =~ m@^17@i) {
+        $osversion = "-HighSierra";
+    } elsif($osversion =~ m@^18@i) {
+        # Running uname -v, shows that darwin kernel version = 18.7.0, which is Mojave
+        # see https://en.wikipedia.org/wiki/MacOS_Mojave
+        $osversion = "-Mojave";
+    }
 }