crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-06 00:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix phar patch

Browse Source
This commit is contained in:
crazywhalecc
2023-05-01 12:50:01 +08:00
parent 85ac553ded
commit 280284e4c2
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/SPC/builder/linux/LinuxBuilder.php
View File

@@ -218,7 +218,7 @@ class LinuxBuilder extends BuilderBase
}
if ($this->phar_patched) {
shell()->cd(SOURCE_PATH . '/php-src')->exec('patch -p1 -R < sapi/micro/patches/phar.patch');
SourcePatcher::patchMicro(['phar'], true);
}
}
@@ -255,12 +255,7 @@ class LinuxBuilder extends BuilderBase
}
if ($this->getExt('phar')) {
$this->phar_patched = true;
try {
shell()->cd(SOURCE_PATH . '/php-src')->exec('patch -p1 < sapi/micro/patches/phar.patch');
} catch (RuntimeException $e) {
logger()->error('failed to patch phat due to patch exit with code ' . $e->getCode());
$this->phar_patched = false;
}
SourcePatcher::patchMicro(['phar']);
}
shell()->cd(SOURCE_PATH . '/php-src')

10
src/SPC/builder/macos/MacOSBuilder.php
View File

@@ -187,7 +187,7 @@ class MacOSBuilder extends BuilderBase
}
if ($this->phar_patched) {
f_passthru('cd ' . SOURCE_PATH . '/php-src && patch -p1 -R < sapi/micro/patches/phar.patch');
SourcePatcher::patchMicro(['phar'], true);
}
}
@@ -218,13 +218,7 @@ class MacOSBuilder extends BuilderBase
}
if ($this->getExt('phar')) {
$this->phar_patched = true;
try {
// TODO: 未来改进一下 patch，让除了这种 patch 类型的文件以外可以恢复原文件
shell()->cd(SOURCE_PATH . '/php-src')->exec('patch -p1 < sapi/micro/patches/phar.patch');
} catch (RuntimeException $e) {
logger()->error('failed to patch phat due to patch exit with code ' . $e->getCode());
$this->phar_patched = false;
}
SourcePatcher::patchMicro(['phar']);
}
shell()->cd(SOURCE_PATH . '/php-src')