From 1d5bd7208ed1c302a7ef74e5321c776fd6685d20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Feb 2016 00:24:32 +0100 Subject: [PATCH] Packager can publish release candidates on foundation server --- build/makepack-dolibarr.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 1d6542eafc9..c8b3c7664e2 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -1150,14 +1150,16 @@ if ($nboftargetok) { if ($target eq 'SF') { $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD; - print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n"; + print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."/".$MAJOR.'.'.$MINOR.'.'.$BUILD."\n"; } else { + $dirnameonly=$file; + $dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/; $filenameonly=$file; - $filenameonly =~ s/.*\/([^\/]+\/[^\/]+)$/$1/; # removes path - $destFolder="$NEWPUBLISH/$filenameonly"; - print "Publish file ".$file." to $NEWPUBLISH/".$filenameonly."\n"; + $filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/; + $destFolder="$NEWPUBLISH/$dirnameonly"; + print "Publish file ".$file." to $NEWPUBLISH/".$dirnameonly."\n"; } # mkdir