mirror_html/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-08-12 00:04:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #526 from cygmris/master

Browse Source 
Add commands support for Windows
This commit is contained in:
Lars Jung
2016-05-27 23:00:26 +02:00
parent 60ef5ff983 ed9f04a372
commit 808e37d034
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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