server_server_com.pm: dead clients will be deleted from known_clients_db when the...

[gosa.git] / gosa-core / update-gosa

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index a223ca7e05ca0b6a1c3c7d31386792a63766b781..a8827e8cd3f3c709816876453bad19249262b8e9 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -1,4 +1,4 @@
-#!/usr/bin/php5
+#!/usr/bin/php
 <?php
 /*
  * This code is part of GOsa (http://www.gosa-project.org)
@@ -35,7 +35,7 @@ Usage: update-gosa install dsc     Install the plugin using the dsc information
        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
 
@@ -188,6 +188,8 @@ function rescan_i18n()
                        exit (5);
                }
        }
+
+       echo "! Warning: you may need to reload your webservice!\n";
 }
 
 
@@ -218,13 +220,15 @@ function rescan_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);
+                                       }
                                }
                        }
                }
@@ -234,7 +238,7 @@ function rescan_guide()
        
        $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);
        }
 
@@ -253,9 +257,9 @@ function parse_ini($file)
                        $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']));
                                }
@@ -416,11 +420,11 @@ function install_plugin($file)
 
                                        /* Calculate destination */
                                        if (preg_match("%^.*locale/%", $source)){
-                                               $dest= GOSA_HOME."/locale/plugin/$name/".preg_replace("%^.*locale/%", "", $source);
+                                               $dest= GOSA_HOME."/locale/plugins/$name/".preg_replace("%^.*locale/%", "", $source);
                                        } elseif (preg_match("%^.*help/%", $source)) {
-                                               $dest= GOSA_HOME."/doc/plugin/$name/".preg_replace("%^.*help/%", "", $source);
+                                               $dest= GOSA_HOME."/doc/plugins/$name/".preg_replace("%^.*help/%", "", $source);
                                        } elseif (preg_match("%^.*html/%", $source)) {
-                                               $dest= GOSA_HOME."/html/$name/".preg_replace("%^.*html/%", "", $source);
+                                               $dest= GOSA_HOME."/html/plugins/$name/".preg_replace("%^.*html/%", "", $source);
                                        } else {
                                                $dest= GOSA_HOME."/plugins/".substr($entry->getPathName(), strlen($path) + 1);
                                        }