From 064527a17ed19951b64b7e78890771abb49499fb Mon Sep 17 00:00:00 2001 From: Kyle Donaldson Date: Tue, 26 Nov 2013 17:03:44 +1100 Subject: [PATCH] Fixing Windows Program Detection command is currently not ported for windows, which however is. To remain intact with the current code already in place, it will detect if the server is running windows or not. --- src/_h5ai/server/php/inc/App.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/_h5ai/server/php/inc/App.php b/src/_h5ai/server/php/inc/App.php index c353f3c9..d7c10dd8 100644 --- a/src/_h5ai/server/php/inc/App.php +++ b/src/_h5ai/server/php/inc/App.php @@ -282,11 +282,19 @@ class App { } $exif = function_exists("exif_thumbnail"); $cache = @is_writable($this->get_cache_abs_path()); - $tar = @preg_match("/tar(.exe)?$/i", `command -v tar`) > 0; - $zip = @preg_match("/zip(.exe)?$/i", `command -v zip`) > 0; - $convert = @preg_match("/convert(.exe)?$/i", `command -v convert`) > 0; - $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `command -v ffmpeg`) > 0; - $du = @preg_match("/du(.exe)?$/i", `command -v du`) > 0; + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $tar = @preg_match("/tar(.exe)?$/i", `which tar`) > 0; + $zip = @preg_match("/zip(.exe)?$/i", `which zip`) > 0; + $convert = @preg_match("/convert(.exe)?$/i", `which convert`) > 0; + $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `which ffmpeg`) > 0; + $du = @preg_match("/du(.exe)?$/i", `which du`) > 0; + } else { + $tar = @preg_match("/tar(.exe)?$/i", `command -v tar`) > 0; + $zip = @preg_match("/zip(.exe)?$/i", `command -v zip`) > 0; + $convert = @preg_match("/convert(.exe)?$/i", `command -v convert`) > 0; + $ffmpeg = @preg_match("/ffmpeg(.exe)?$/i", `command -v ffmpeg`) > 0; + $du = @preg_match("/du(.exe)?$/i", `command -v du`) > 0; + } return array( "idx" => $this->app_abs_href . "server/php/index.php",