From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Apr 2008 09:18:07 +0000 (+0000)
Subject: Unified to plugins
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57c948f5230dcac0408be532f136e1ade3a2515f;p=gosa.git

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 6d547936e..fe36fe41b 100755
--- 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 a223ca7e0..73eb2c69f 100755
--- 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);
 					}