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

Use redirect instead

Browse Source
This commit is contained in:
crazywhalecc
2026-07-06 19:35:48 +08:00
parent fa040bc346
commit c9401a0b7a
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/StaticPHP/Util/SourcePatcher.php
View File

@@ -47,17 +47,14 @@ class SourcePatcher
} }
$patch_cwd = FileSystem::convertPath($cwd); $patch_cwd = FileSystem::convertPath($cwd);
$patch_arg = $patch_str; $patch_arg = $patch_str;
if (PHP_OS_FAMILY === 'Windows') {
$patch_arg = FileSystem::convertWinPathToMinGW($patch_arg);
}
// Detect if patch is already applied (reverse detection) // Detect if patch is already applied (reverse detection)
$detect_reverse = !$reverse; $detect_reverse = !$reverse;
$cd_cmd = (PHP_OS_FAMILY === 'Windows' ? 'cd /d ' : 'cd ') . escapeshellarg($patch_cwd); $cd_cmd = (PHP_OS_FAMILY === 'Windows' ? 'cd /d ' : 'cd ') . escapeshellarg($patch_cwd);
$detect_cmd = $cd_cmd $detect_cmd = $cd_cmd
. ' && patch --dry-run -p1 -s -f' . ' && patch --dry-run -p1 -s -f'
. ' -i ' . escapeshellarg($patch_arg)
. ($detect_reverse ? ' -R' : '') . ($detect_reverse ? ' -R' : '')
. ' < ' . escapeshellarg($patch_arg)
. ' > ' . (PHP_OS_FAMILY === 'Windows' ? 'NUL' : '/dev/null') . ' 2>&1'; . ' > ' . (PHP_OS_FAMILY === 'Windows' ? 'NUL' : '/dev/null') . ' 2>&1';
exec($detect_cmd, $output, $detect_status); exec($detect_cmd, $output, $detect_status);
@@ -69,8 +66,8 @@ class SourcePatcher
// Apply patch // Apply patch
$apply_cmd = $cd_cmd $apply_cmd = $cd_cmd
. ' && patch -p1' . ' && patch -p1'
. ' -i ' . escapeshellarg($patch_arg) . ($reverse ? ' -R' : '')
. ($reverse ? ' -R' : ''); . ' < ' . escapeshellarg($patch_arg);
exec($apply_cmd, $apply_output, $apply_status); exec($apply_cmd, $apply_output, $apply_status);
if ($apply_status !== 0) { if ($apply_status !== 0) {