diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 73eb2c69f47a89d65dc48e2f5c69a5101f3c29c5..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)
update-gosa remove plugin Remove the plugin named "plugin" from
the current configuration.
update-gosa remove plugin Remove the plugin named "plugin" from
the current configuration.
- update-gosa lists Lists installed plugins
+ update-gosa list Lists installed plugins
update-gosa rescan-i18n Rebuilds the translations
update-gosa rescan-i18n Rebuilds the translations
}
/* 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";
}
}
$master_guide_content.= file_get_contents($guide);
}
$master_guide_content.= file_get_contents($guide);
}
- $plugins= scandir('doc/plugins');
- foreach($plugins as $key => $plugin) {
- if($plugin != '.' && $plugin != '..') {
- if(is_dir('doc/plugins/'.$plugin)) {
- $guide= 'doc/plugins/'.$plugin.'/guide.xml';
- if(file_exists($guide) && is_readable($guide)) {
- $master_guide_content.= file_get_contents($guide);
+ if(file_exists('doc/plugins')) {
+ $plugins= scandir('doc/plugins');
+ foreach($plugins as $key => $plugin) {
+ if($plugin != '.' && $plugin != '..') {
+ if(is_dir('doc/plugins/'.$plugin)) {
+ $guide= 'doc/plugins/'.$plugin.'/guide.xml';
+ if(file_exists($guide) && is_readable($guide)) {
+ $master_guide_content.= file_get_contents($guide);
+ }
}
}
}
}
}
}
$master_guide_content= preg_replace("/[ \t][ \t]*/", " ", $master_guide_content);
$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);
}
file_put_contents($master_guide, $master_guide_content);
}
$plugin= &$tmp['gosa-plugin'];
if (isset($plugin['name'])&& isset($plugin['description'])){
$res= $plugin['name'];
$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'];
$description[$res]= $plugin['description'];
$versions[$res]= $plugin['version'];
+ $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']));
}