diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index e10df6e50823214fd63e726dfd38633f6b7eefa5..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)
}
/* 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);
exit (5);
}
}
+
+ echo "! Warning: you may need to reload your webservice!\n";
}
$master_guide_content= preg_replace("/[ \t][ \t]*/", " ", $master_guide_content);
- if(is_writable($master_guide)) {
+ if((file_exists($master_guide) && is_writable($master_guide)) || is_writable('doc')) {
file_put_contents($master_guide, $master_guide_content);
}
$plugin= &$tmp['gosa-plugin'];
if (isset($plugin['name'])&& isset($plugin['description'])){
$res= $plugin['name'];
- $provides[$res]= $plugin[$res];
$description[$res]= $plugin['description'];
$versions[$res]= $plugin['version'];
+ $provides[$res]= $res;
if (isset($plugin['depends'])){
$depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
}