diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 76693ce920af2c56dc237e0e946492380b6a3a91..55214d133d92abce2ba557858b96896ab11558e8 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
-#!/usr/bin/php5
+#!/usr/bin/php
<?php
/*
* This code is part of GOsa (http://www.gosa-project.org)
<?php
/*
* This code is part of GOsa (http://www.gosa-project.org)
}
/* Cat all these po files into one single file */
}
/* Cat all these po files into one single file */
- system ("(cd ".LOCALE_DIR." && msgcat ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
+ system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
if ($val != 0){
echo "Merging of message files failed - aborted";
exit (4);
if ($val != 0){
echo "Merging of message files failed - aborted";
exit (4);
exit (5);
}
}
exit (5);
}
}
+
+ echo "! Warning: you may need to reload your webservice!\n";
}
}
$res= $plugin['name'];
$description[$res]= $plugin['description'];
$versions[$res]= $plugin['version'];
$res= $plugin['name'];
$description[$res]= $plugin['description'];
$versions[$res]= $plugin['version'];
- if (isset($plugin['provides'])){
- $provides[$res]= explode(',', preg_replace('/\s+/', '', $plugin['provides']));
- }
+ $provides[$res]= $res;
if (isset($plugin['depends'])){
$depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
}
if (isset($plugin['depends'])){
$depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
}
foreach ($depends as $name => $pl_depends){
foreach ($pl_depends as $pl){
foreach ($depends as $name => $pl_depends){
foreach ($pl_depends as $pl){
- if (!is_provided($pl, $provides)){
+ if (!in_array($pl, $provides)){
echo "! Error: plugin '$name' depends on '$pl' which is not provided by any plugin\n\n";
exit (1);
}
echo "! Error: plugin '$name' depends on '$pl' which is not provided by any plugin\n\n";
exit (1);
}
}
}
-function is_provided($dependency)
-{
- global $provides;
-
- $result= FALSE;
- foreach ($provides as $name => $pl_provides){
- if(in_array($dependency, $pl_provides)) {
- $result= TRUE;
- continue;
- }
- }
-
- return $result;
-}
-
-
function load_plugins()
{
if (!is_dir(PLUGSTATE_DIR)){
function load_plugins()
{
if (!is_dir(PLUGSTATE_DIR)){