Unified to plugins

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

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index 6d547936e03ae855bd2d677252705700cd00f497..fe36fe41b9abd206ea6d6dd5af2bc62b254df5cc 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -160,7 +160,7 @@ if [ -d contrib ]; then
 fi
 if [ -d html ]; then
        for i in html/*; do
-               echo "$i /usr/share/gosa/html/$PL_NAME" >> debian/install
+               echo "$i /usr/share/gosa/html/plugins/$PL_NAME" >> debian/install
        done
 fi
 

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index a223ca7e05ca0b6a1c3c7d31386792a63766b781..73eb2c69f47a89d65dc48e2f5c69a5101f3c29c5 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -416,11 +416,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);
                                        }