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

Improve cmd checks.

Browse Source
This commit is contained in:
Lars Jung 2014-08-04 21:58:16 +02:00
parent 237ae10be1
commit 98b2a2af09
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/_h5ai/server/php/inc/setup.php
View File

@ -84,8 +84,15 @@ function setup() {
// EXTERNAL COMMANDS
foreach (array("tar", "zip", "convert", "ffmpeg", "avconv", "du") as $cmd) {
$cmdv = HAS_WIN_OS ? array("which", $cmd) : array("command", "-v", $cmd);
define("HAS_CMD_" . strtoupper($cmd), @preg_match("#" . $cmd . "(.exe)?$#i", exec_cmdv($cmdv)) > 0);
// todo: cache all cmd tests
$cmd = false;
if (!$cmd && exec_0("command -v command")) {
$cmd = "command -v";
}
if (!$cmd && exec_0("which which")) {
$cmd = "which";
}
foreach (array("tar", "zip", "convert", "ffmpeg", "avconv", "du") as $c) {
define("HAS_CMD_" . strtoupper($c), ($cmd !== false) && exec_0($cmd . " " . $c));
}
}

12
src/_h5ai/server/php/inc/util.php
View File

@ -96,6 +96,18 @@ function exec_cmdv($cmdv) {
}
function exec_0($cmd) {
$lines = array();
$rc = null;
try {
@exec($cmd, $lines, $rc);
return $rc === 0;
} catch (Exception $e) {}
return false;
}
/*********************************************************************
Debug Tools