X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fupdate-gosa;h=55214d133d92abce2ba557858b96896ab11558e8;hb=d4bbdb7d8a56d23a2ae8f3c7459a9e0eb16a2320;hp=76693ce920af2c56dc237e0e946492380b6a3a91;hpb=24d411c316d4fd335b32220d586e5cf2b47109bb;p=gosa.git

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 76693ce92..55214d133 100755
--- 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)
@@ -177,7 +177,7 @@ function rescan_i18n()
 		}
 
 		/* 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);
@@ -188,6 +188,8 @@ function rescan_i18n()
 			exit (5);
 		}
 	}
+
+	echo "! Warning: you may need to reload your webservice!\n";
 }
 
 
@@ -257,9 +259,7 @@ function parse_ini($file)
 				$res= $plugin['name'];
 				$description[$res]= $plugin['description'];
 				$versions[$res]= $plugin['version'];
-				if (isset($plugin['provides'])){
-					$provides[$res]= explode(',', preg_replace('/\s+/', '', $plugin['provides']));
-				}
+				$provides[$res]= $res;
 				if (isset($plugin['depends'])){
 					$depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
 				}
@@ -280,7 +280,7 @@ function dependency_check()
 
 	foreach ($depends as $name => $pl_depends){
 		foreach ($pl_depends as $pl){
-			if (!is_provided($pl, $provides)){
+			if (!in_array($pl, $provides)){
 				echo "! Error: plugin '$name' depends on '$pl' which is not provided by any plugin\n\n";
 				exit (1);
 			}
@@ -289,22 +289,6 @@ function dependency_check()
 }
 
 
-function is_provided($dependency)
-{
-	global $provides;
-
-	$result= FALSE;
-	foreach ($provides as $name => $pl_provides){
-		if(in_array($dependency, $pl_provides)) {
-			$result= TRUE;
-			continue;
-		}
-	}
-
-	return $result;
-}
-
-
 function load_plugins()
 {
 	if (!is_dir(PLUGSTATE_DIR)){