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

This commit is contained in:
Laurent Destailleur 2021-08-19 02:55:33 +02:00
commit 0169dc0d04

View File

@ -124,8 +124,8 @@ print "\n";
//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml'; //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
$outputdir=dirname(dirname(__FILE__)).'/htdocs/install'; $outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
print 'Delete current files '.$outputdir.'/filelist*.xml'."\n"; print 'Delete current files '.$outputdir.'/filelist*.xml*'."\n";
dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1); dol_delete_file($outputdir.'/filelist*.xml*', 0, 1, 1);
$checksumconcat=array(); $checksumconcat=array();
@ -239,8 +239,11 @@ fclose($fp);
if (empty($buildzip)) { if (empty($buildzip)) {
print "File ".$outputfile." generated\n"; print "File ".$outputfile." generated\n";
} else { } else {
dol_compress_file($outputfile, $outputfile.'.zip'); $result = dol_compress_file($outputfile, $outputfile.'.zip');
print "File ".$outputfile.".zip generated\n"; if ($result > 0) {
dol_delete_file($outputfile);
print "File ".$outputfile.".zip generated\n";
}
} }
exit(0); exit(0);