Browse Source

Merge pull request #21 from nigelgbanks/ISLANDORA-322

ISLANDORA-322: fix the checks for convert and kdu_compress.
pull/22/merge
Ben Woodhead 13 years ago
parent
commit
da6351439d
  1. 7
      fedora_repository.install

7
fedora_repository.install

@ -89,9 +89,9 @@ function fedora_repository_requirements($phase) {
} }
// Test for Imagick // Test for Imagick
system("hash convert 2>&-", $return_value);
$requirements['imagick']['title'] = t("Image Magick library"); $requirements['imagick']['title'] = t("Image Magick library");
//if ( ! class_exists('Imagick') ) { if ($return_value) {
if (!file_exists('convert')) {
$requirements['imagick']['value'] = t("Not installed"); $requirements['imagick']['value'] = t("Not installed");
$requirements['imagick']['severity'] = REQUIREMENT_ERROR; $requirements['imagick']['severity'] = REQUIREMENT_ERROR;
$requirements['imagick']['description'] = t('Ensure that the Image Magick library is installed.'); $requirements['imagick']['description'] = t('Ensure that the Image Magick library is installed.');
@ -102,8 +102,9 @@ function fedora_repository_requirements($phase) {
} }
// Test for Kakadu // Test for Kakadu
system("hash kdu_compress 2>&-", $return_value);
$requirements['kakadu']['title'] = t("Kakadu library"); $requirements['kakadu']['title'] = t("Kakadu library");
if (!file_exists('kdu_compress')) { if ($return_value) {
$requirements['kakadu']['value'] = t("Not installed"); $requirements['kakadu']['value'] = t("Not installed");
$requirements['kakadu']['severity'] = REQUIREMENT_ERROR; $requirements['kakadu']['severity'] = REQUIREMENT_ERROR;
$requirements['kakadu']['description'] = t('Ensure that the Kakadu library is installed.'); $requirements['kakadu']['description'] = t('Ensure that the Kakadu library is installed.');

Loading…
Cancel
Save