Skip to content

Commit eefaac6

Browse files
committed
Upgrade jppm.
1 parent 9d02b37 commit eefaac6

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

packager/package.php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: jppm
2-
version: 0.6.6
2+
version: 0.6.7
33

44
plugins: [GitHub, Hub, Doc]
55

@@ -17,7 +17,7 @@ github:
1717
> JPHP Package Manager v%version%
1818
1919
**What's new**
20-
+ Fix git sources and semver bugs.
20+
+ Add JPPM_OS_BUILD env option.
2121
2222
**Downloads**
2323
+ For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

packager/src-php/packager/cli/ConsoleApp.php

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,22 @@ function main(array $args)
9292
if ($this->isFlag('without-os')) {
9393
// nop.
9494
} else {
95-
if ($this->isFlag('win')) {
96-
$os = 'win';
97-
} else if ($this->isFlag('mac') || str::posIgnoreCase($osName, 'mac') > -1) {
98-
$os = 'mac';
99-
} else if ($this->isFlag('linux')) {
100-
$os = 'linux';
101-
} else if (str::posIgnoreCase($osName, 'win') > -1) {
102-
$os = 'win';
103-
} else if (str::posIgnoreCase($osName, 'mac') > -1) {
104-
$os = 'mac';
95+
if ($_ENV['JPPM_OS_BUILD']) {
96+
$os = $_ENV['JPPM_OS_BUILD'];
10597
} else {
106-
$os = 'linux';
98+
if ($this->isFlag('win')) {
99+
$os = 'win';
100+
} else if ($this->isFlag('mac') || $this->isFlag('darwin')) {
101+
$os = 'mac';
102+
} else if ($this->isFlag('linux')) {
103+
$os = 'linux';
104+
} else if (str::posIgnoreCase($osName, 'win') > -1) {
105+
$os = 'win';
106+
} else if (str::posIgnoreCase($osName, 'mac') > -1) {
107+
$os = 'mac';
108+
} else {
109+
$os = 'linux';
110+
}
107111
}
108112
}
109113

0 commit comments

Comments
 (0)