mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Apply fixes from StyleCI (#12124)
This commit is contained in:
@@ -32,9 +32,9 @@ if (! is_writable(getenv('HOME'))) {
|
||||
|
||||
$use_https = true;
|
||||
// Set up proxy if needed, check git config for proxies too
|
||||
if ($proxy = getenv("HTTPS_PROXY") ?: getenv("https_proxy")) {
|
||||
if ($proxy = getenv('HTTPS_PROXY') ?: getenv('https_proxy')) {
|
||||
$use_https = true;
|
||||
} elseif ($proxy = getenv("HTTP_PROXY") ?: getenv("http_proxy")) {
|
||||
} elseif ($proxy = getenv('HTTP_PROXY') ?: getenv('http_proxy')) {
|
||||
$use_https = false;
|
||||
} elseif ($proxy = trim(shell_exec('git config --global --get https.proxy'))) {
|
||||
putenv("HTTPS_PROXY=$proxy");
|
||||
@@ -86,7 +86,7 @@ if (is_file($install_dir . '/composer.phar')) {
|
||||
|
||||
// if nothing else, use system supplied composer
|
||||
if (! $exec) {
|
||||
$path_exec = trim(shell_exec("which composer 2> /dev/null"));
|
||||
$path_exec = trim(shell_exec('which composer 2> /dev/null'));
|
||||
if ($path_exec) {
|
||||
$exec = $path_exec;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user