Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
Adding a final fallback for findBinaryPath
This commit is contained in:
commit
70480423ff
|
@ -931,7 +931,12 @@ class OC_Helper {
|
|||
// Returns null if nothing is found
|
||||
$result = $exeSniffer->find($program);
|
||||
if (empty($result)) {
|
||||
$paths = str_replace(':','/ ',getenv('PATH'));
|
||||
$paths = getenv('PATH');
|
||||
if (empty($paths)) {
|
||||
$paths = '/usr/local/bin /usr/bin /opt/bin /bin';
|
||||
} else {
|
||||
$paths = str_replace(':',' ',getenv('PATH'));
|
||||
}
|
||||
$command = 'find ' . $paths . ' -name ' . escapeshellarg($program) . ' 2> /dev/null';
|
||||
exec($command, $output, $returnCode);
|
||||
if (count($output) > 0) {
|
||||
|
|
Loading…
Reference in New Issue