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

Replace some more "command -v" calls with the Helper method

Browse source
This commit is contained in:
Joas Schilling 2014-11-25 11:06:26 +01:00
parent 6fb2477fb7
commit 0274dcba57
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 * check if smbclient is installed
*/ */
public static function checkDependencies() { public static function checkDependencies() {
if (function_exists('shell_exec')) { $smbClientExists = (bool) \OC_Helper::findBinaryPath('smbclient');
$output=shell_exec('command -v smbclient 2> /dev/null'); return $smbClientExists ? true : array('smbclient');
if (!empty($output)) {
return true;
}
}
return array('smbclient');
} }
} }

4
lib/private/installer.php
View file

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