From: Olivier Paroz Date: Tue, 14 Apr 2015 12:06:58 +0000 (+0200) Subject: Adding a final fallback for findBinaryPath X-Git-Tag: v8.1.0alpha1~11^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb0c09e994869b216b8163d262ffc7db9d439221;p=nextcloud-server.git Adding a final fallback for findBinaryPath --- diff --git a/lib/private/helper.php b/lib/private/helper.php index cb95dd49beb..11311d7c55f 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -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) {