Replace 'which' with 'command -v' to be POSIX compatible here.

This commit is contained in:
Lars Jung 2013-07-28 16:15:20 +02:00
parent 696409e19c
commit 3733d0c6d0

View file

@ -280,11 +280,11 @@ class App {
} }
$exif = function_exists("exif_thumbnail"); $exif = function_exists("exif_thumbnail");
$cache = @is_writable($this->get_cache_abs_path()); $cache = @is_writable($this->get_cache_abs_path());
$tar = @preg_match("/tar(.exe)?$/i", `which tar`) > 0; $tar = @preg_match("/tar(.exe)?$/i", `command -v tar`) > 0;
$zip = @preg_match("/zip(.exe)?$/i", `which zip`) > 0; $zip = @preg_match("/zip(.exe)?$/i", `command -v zip`) > 0;
$convert = @preg_match("/convert(.exe)?$/i", `which convert`) > 0; $convert = @preg_match("/convert(.exe)?$/i", `command -v convert`) > 0;
$ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `which ffmpeg`) > 0; $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `command -v ffmpeg`) > 0;
$du = @preg_match("/du(.exe)?$/i", `which du`) > 0; $du = @preg_match("/du(.exe)?$/i", `command -v du`) > 0;
return array( return array(
"idx" => $this->app_abs_href . "server/php/index.php", "idx" => $this->app_abs_href . "server/php/index.php",