Upgrade jppm.

jphp-group · Jul 7, 2020 · eefaac6 · eefaac6
1 parent 9d02b37
commit eefaac6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/packager/package.php.yml b/packager/package.php.yml
@@ -1,5 +1,5 @@
 name: jppm
-version: 0.6.6
+version: 0.6.7
 
 plugins: [GitHub, Hub, Doc]
 
@@ -17,7 +17,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Fix git sources and semver bugs.
+    + Add JPPM_OS_BUILD env option.
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

diff --git a/packager/src-php/packager/cli/ConsoleApp.php b/packager/src-php/packager/cli/ConsoleApp.php
@@ -92,18 +92,22 @@ function main(array $args)
             if ($this->isFlag('without-os')) {
                 // nop.
             } else {
-                if ($this->isFlag('win')) {
-                    $os = 'win';
-                } else if ($this->isFlag('mac') || str::posIgnoreCase($osName, 'mac') > -1) {
-                    $os = 'mac';
-                } else if ($this->isFlag('linux')) {
-                    $os = 'linux';
-                } else if (str::posIgnoreCase($osName, 'win') > -1) {
-                    $os = 'win';
-                } else if (str::posIgnoreCase($osName, 'mac') > -1) {
-                    $os = 'mac';
+                if ($_ENV['JPPM_OS_BUILD']) {
+                    $os = $_ENV['JPPM_OS_BUILD'];
                 } else {
-                    $os = 'linux';
+                    if ($this->isFlag('win')) {
+                        $os = 'win';
+                    } else if ($this->isFlag('mac') || $this->isFlag('darwin')) {
+                        $os = 'mac';
+                    } else if ($this->isFlag('linux')) {
+                        $os = 'linux';
+                    } else if (str::posIgnoreCase($osName, 'win') > -1) {
+                        $os = 'win';
+                    } else if (str::posIgnoreCase($osName, 'mac') > -1) {
+                        $os = 'mac';
+                    } else {
+                        $os = 'linux';
+                    }
                 }
             }