diff options
Diffstat (limited to 'crates/shirabe/src/installer/binary_installer.rs')
| -rw-r--r-- | crates/shirabe/src/installer/binary_installer.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs index 4bcb6865..4e3b5e4c 100644 --- a/crates/shirabe/src/installer/binary_installer.rs +++ b/crates/shirabe/src/installer/binary_installer.rs @@ -8,11 +8,10 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::ProcessExecutor; use crate::util::Silencer; -use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists, - file_get_contents5, file_put_contents, fopen, is_dir, is_file, is_link, php_regex, realpath, - rmdir, substr, trim, umask, + file_get_contents5, file_put_contents, fopen, is_dir, is_file, is_link, php_regex, preg_match2, + realpath, rmdir, substr, trim, umask, }; /// Seam over the BinaryInstaller methods reached through LibraryInstaller, so tests can inject a @@ -201,9 +200,10 @@ impl BinaryInstaller { } Err(_) => String::new(), }; - if let Some(m) = Preg::is_match3( + if let Some(m) = preg_match2( php_regex!(r"{^#!/(?:usr/bin/env )?(?:[^/]+/)*(.+)$}m"), &line, + 0, ) { return trim(m.get(1).unwrap_or(""), None); } @@ -316,9 +316,10 @@ impl BinaryInstaller { file_get_contents5(bin, false, PhpMixed::Null, 0, Some(500)).unwrap_or_default(); // For php files, we generate a PHP proxy instead of a shell one, // which allows calling the proxy with a custom php process - if let Some(m) = Preg::is_match3( + if let Some(m) = preg_match2( php_regex!(r"{^(#!.*\r?\n)?[\r\n\t ]*<\?php}"), &bin_contents, + 0, ) { // carry over the existing shebang if present, otherwise add our own let proxy_code = match m.get(1) { |