X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fupdate-gosa;h=55214d133d92abce2ba557858b96896ab11558e8;hb=630626c6abe0a2d649dd03221ac43dd4ed53b0c0;hp=e10df6e50823214fd63e726dfd38633f6b7eefa5;hpb=eb6cc43e7c336cacd24628aebb482cf9118551f1;p=gosa.git

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index e10df6e50..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";
 }
 
 
@@ -236,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);
 	}
 
@@ -255,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']));
 				}