Check if GNU patch is used #426
Conversation
| $patchVersion = ''; | ||
| $this->executor->execute('patch --version', $patchVersion); | ||
| if (strpos($patchBinaryVersion, 'GNU patch') === false) { | ||
| throw new \Exception( |
There was a problem hiding this comment.
The intention here should be for non-GNU versions of patch to actually work! :) Please review the PR at #402 where we try to get the non-GNU patch working (with a pretty trivial fix).
| @@ -443,6 +443,14 @@ protected function getAndApplyPatch(RemoteFilesystem $downloader, $install_path, | |||
| // differences between how patch works on windows and unix. | |||
| $patch_options = '--no-backup-if-mismatch'; | |||
| if (PHP_OS_FAMILY == 'BSD') { | |||
There was a problem hiding this comment.
This won't work reliably because PHP_OS_FAMILY reflect the build target for the running PHP version, not the current hosting environment. In my case on MacOS Ventura, for whatever reason, PHP_OS_FAMILY is Linux. See https://github.com/loophp/phposinfo, but I don't know that we want to introduce a new dependency just for this.
There was a problem hiding this comment.
I think what you're saying is the PHP documentation is wrong: When it says "The operating system family PHP was built for" what they actually mean is "The operating system family PHP was built on"? If so, uhg..
So maybe looking at patch --version is correct after all, although all the logic needed there might not be pretty.
There was a problem hiding this comment.
Yeah the only semi-reliable way to detect runtime OS is php_uname, but even that will fall back to displaying the build OS in some situations. I found the phposinfo library to do a pretty good job of compensating for this by using a combination of php_uname, PHP_OS_FAMILY, and shell commands to verify the OS version.
It's obviously better to avoid any conditional logic based on the OS in the first place.
|
#447 takes care of this |
fixes #326