diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-26 10:29:41 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-26 10:29:41 +0100 |
| commit | c749570a06fa4d24927fbd7aad13b36a8f1ff439 (patch) | |
| tree | d3ee72338603cfb4e3c585c07417c85678e70d26 /apps/files_external | |
| parent | 1da46b1a5821683b790349f1d11b7a49714b0994 (diff) | |
| parent | 0274dcba575272585a6f0b16bc777301f9458537 (diff) | |
| download | nextcloud-server-c749570a06fa4d24927fbd7aad13b36a8f1ff439.tar.gz nextcloud-server-c749570a06fa4d24927fbd7aad13b36a8f1ff439.zip | |
Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/smb.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 6e53c4a9931..3f0b0f45bfb 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -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'); } } |