From 6d4aa1ad08e848a67f317d3d3b059716fc91d627 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Aug 2021 02:51:24 +0200 Subject: [PATCH 1/2] Fix deletion of old signature file --- build/generate_filelist_xml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php index e5f83e42cfc..dd9fe83a4b3 100755 --- a/build/generate_filelist_xml.php +++ b/build/generate_filelist_xml.php @@ -124,8 +124,8 @@ print "\n"; //$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(); From 8f1b4df5f4fd1b482dccbf8d94528d38c352f51b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Aug 2021 02:54:58 +0200 Subject: [PATCH 2/2] Fix deletion of old file --- build/generate_filelist_xml.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php index dd9fe83a4b3..8e7ef3ef46c 100755 --- a/build/generate_filelist_xml.php +++ b/build/generate_filelist_xml.php @@ -239,8 +239,11 @@ fclose($fp); 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);