andrea/h5ai-flpsite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and clean code from broken pull request.

Browse Source
This commit is contained in:
Lars Jung 2016-05-27 23:06:50 +02:00
parent 808e37d034
commit 69c1ffd92f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_h5ai/private/php/core/class-setup.php
View File

@ -119,17 +119,17 @@ class Setup {
$cmds = Json::load($cmds_cache_path);
if (sizeof($cmds) === 0 || $this->refresh) {
$cmds['command'] = Util::exec_0('command -v command');
$cmds['which'] = Util::exec_0('which which') ? true : Util::exec_0('which which.exe');
$cmds['which'] = Util::exec_0('which which') || Util::exec_0('which which.exe');
$cmd = false;
if ($cmds['command']) {
$cmd = 'command -v';
} else if ($cmds['which']) {
$cmd = 'which ';
$cmd = 'which';
}
foreach (['avconv', 'convert', 'du', 'ffmpeg', 'gm', 'tar', 'zip'] as $c) {
$cmds[$c] = ($cmd !== false) && Util::exec_0($cmd . $c) || Util::exec_0($cmd . $c . '.exe');
$cmds[$c] = ($cmd !== false) && (Util::exec_0($cmd . ' ' . $c) || Util::exec_0($cmd . ' ' . $c . '.exe'));
}
Json::save($cmds_cache_path, $cmds);