Updated build/and update

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8526 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules
index e1699bea6d516272ad36d1d060ee1a12d3eb4d94..46166f3aeca45d1259482c3ed45a411b08303a16 100755 (executable)
--- a/gosa-core/debian/rules
+++ b/gosa-core/debian/rules
@@ -92,6 +92,7 @@ install-stamp:
 
        # Clean up
        -rm -rf debian/gosa/usr/share/gosa/contrib
+       -rm -rf debian/gosa/usr/share/gosa/state
        -rm -rf debian/gosa/usr/share/gosa/locale/en
        -rm -rf debian/gosa/usr/share/gosa/update-locale
        -rm -rf debian/gosa/usr/share/gosa/update-pdf-help

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 89b83232d80e7426496901c994c88cf9b6946396..2907dee9607b93e709f393b04a19da96a09c920a 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -2,15 +2,13 @@
 <?php
 
 define ("LOCALE_DIR", dirname(__FILE__)."/locale");
-define ("PLUGSTATE_DIR", "/tmp/gosa");
+define ("PLUGSTATE_DIR", dirname(__FILE__)."/state");
 
 function print_usage()
 {
        ?>
 update-gosa - class cache updated and plugin manager for GOsa
-Usage: update-gosa                        Update the class cache
-
-       update-gosa install-plugin dir     Install the plugin placed in "dir" to
+Usage: update-gosa install-plugin dir     Install the plugin placed in "dir" to
                                           the GOsa tree.
 
        update-gosa remove-plugin plugin   Remove the plugin named "plugin" from
@@ -22,6 +20,7 @@ Usage: update-gosa                        Update the class cache
 
        update-gosa rescan-classes         Rebuilds the class list
        
+       update-gosa                        Shortcut for rescan-classes and rescan-i18n
 <?php
        exit (1);
 }
@@ -193,6 +192,12 @@ function dependency_check()
 
 function load_plugins()
 {
+       if (!file_exists(PLUGSTATE_DIR)){
+               if (!mkdir (PLUGSTATE_DIR", 0755, TRUE)){
+                       echo "Cannot create plugstate dir '".PLUGSTATE_DIR."' - aborted\n";
+                       exit (2);
+               }
+       }
        $dir= new DirectoryIterator(PLUGSTATE_DIR);
        foreach ($dir as $entry){
                if ($dir->isDir() && !preg_match('/^\./', $dir->__toString())){
@@ -258,7 +263,8 @@ $description= $provides= $depends= array();
 
 /* Action specified? */
 if ($argc < 2){
-       print_usage();
+       rescan_classes();
+       rescan_i18n();
         exit (0);
 }
 switch ($argv[1]){