wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12411 from owncloud/unknown-command-windows

Browse source 
Replace some more "command -v" calls with the Helper method
This commit is contained in:
Lukas Reschke 2014-11-26 10:29:41 +01:00
commit c749570a06
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_external/lib/smb.php
View file

@ -139,13 +139,8 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
* check if smbclient is installed
*/
public static function checkDependencies() {
if (function_exists('shell_exec')) {
$output=shell_exec('command -v smbclient 2> /dev/null');
if (!empty($output)) {
return true;
}
}
return array('smbclient');
$smbClientExists = (bool) \OC_Helper::findBinaryPath('smbclient');
return $smbClientExists ? true : array('smbclient');
}
}

4
lib/private/installer.php
View file

@ -558,8 +558,8 @@ class OC_Installer{
// is the code checker enabled?
if(OC_Config::getValue('appcodechecker', true)) {
// check if grep is installed
$grep = exec('command -v grep');
if($grep=='') {
$grep = \OC_Helper::findBinaryPath('grep');
if (!$grep) {
OC_Log::write('core',
'grep not installed. So checking the code of the app "'.$appname.'" was not possible',
OC_Log::ERROR);