mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PHP_BINDIR to allow composer.phar to work in more situations

Browse Source
This commit is contained in:
Tony Murray
2020-06-21 15:06:07 -05:00
parent 685d1972f1
commit 258d693477
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/composer_wrapper.php
View File

@@ -55,7 +55,7 @@ if (php_sapi_name() == 'cli' && isset($_SERVER['TERM'])) {
}
if (is_file($install_dir . '/composer.phar')) {
$exec = 'php ' . $install_dir . '/composer.phar';
$exec = PHP_BINDIR . '/php ' . $install_dir . '/composer.phar';
// self-update
passthru("$exec self-update -q" . $extra_args);
@@ -77,8 +77,8 @@ if (is_file($install_dir . '/composer.phar')) {
echo "Error: Failed to download $installer_url\n";
} elseif (@hash_file('SHA384', $dest) === $good_sha) {
// Installer verified
shell_exec("php $dest");
$exec = "php $install_dir/composer.phar";
shell_exec(PHP_BINDIR . "/php $dest");
$exec = PHP_BINDIR . "/php $install_dir/composer.phar";
} else {
echo "Error: Corrupted download, signature doesn't match for $installer_url\n";
}