From 20ffe321d1c791247fd143d858382230cd009816 Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigel.g.banks@gmail.com>
Date: Fri, 9 Sep 2011 18:19:18 +0100
Subject: [PATCH] ISLANDORA-322: fix the checks for convert and kdu_compress.
---
fedora_repository.install | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fedora_repository.install b/fedora_repository.install
index 08c3e05f..d9b06b17 100644
--- a/fedora_repository.install
+++ b/fedora_repository.install
@@ -89,9 +89,9 @@ function fedora_repository_requirements($phase) {
}
// Test for Imagick
+ system("hash convert 2>&-", $return_value);
$requirements['imagick']['title'] = t("Image Magick library");
- //if ( ! class_exists('Imagick') ) {
- if (!file_exists('convert')) {
+ if ($return_value) {
$requirements['imagick']['value'] = t("Not installed");
$requirements['imagick']['severity'] = REQUIREMENT_ERROR;
$requirements['imagick']['description'] = t('Ensure that the Image Magick library is installed.');
@@ -102,8 +102,9 @@ function fedora_repository_requirements($phase) {
}
// Test for Kakadu
+ system("hash kdu_compress 2>&-", $return_value);
$requirements['kakadu']['title'] = t("Kakadu library");
- if (!file_exists('kdu_compress')) {
+ if ($return_value) {
$requirements['kakadu']['value'] = t("Not installed");
$requirements['kakadu']['severity'] = REQUIREMENT_ERROR;
$requirements['kakadu']['description'] = t('Ensure that the Kakadu library is installed.');