Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

Dolibarr · Aug 19, 2021 · 0169dc0 · 0169dc0
2 parents eb70cb2 + 8f1b4df
commit 0169dc0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
@@ -124,8 +124,8 @@
 
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
 $outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
-print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
-dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1);
+print 'Delete current files '.$outputdir.'/filelist*.xml*'."\n";
+dol_delete_file($outputdir.'/filelist*.xml*', 0, 1, 1);
 
 $checksumconcat=array();
 
@@ -239,8 +239,11 @@
 if (empty($buildzip)) {
 	print "File ".$outputfile." generated\n";
 } else {
-	dol_compress_file($outputfile, $outputfile.'.zip');
-	print "File ".$outputfile.".zip generated\n";
+	$result = dol_compress_file($outputfile, $outputfile.'.zip');
+	if ($result > 0) {
+		dol_delete_file($outputfile);
+		print "File ".$outputfile.".zip generated\n";
+	}
 }
 
 exit(0);