From 3bfd60a1dc138f1910529bd15043ec731525d572 Mon Sep 17 00:00:00 2001 From: YiiChang Yen Date: Thu, 23 Oct 2014 14:59:06 +0800 Subject: Setting download name: To let other product name can pass to $start MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because the product name may be others. Change-Id: I2cd60fd029c7a75b8018b681303aa2883cd3dc97 Reviewed-on: https://gerrit.libreoffice.org/12074 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- solenv/bin/modules/installer/download.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index d9b3d46f09e5..017d04834645 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -299,13 +299,17 @@ sub get_downloadname_productname { my ($allvariables) = @_; - my $start = "LibreOffice"; + my $start = ""; if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibreOffice"; } - if ( $allvariables->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { $start = "LibreOfficeDev"; } + elsif ( $allvariables->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { $start = "LibreOfficeDev"; } - if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; } + elsif ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; } + + elsif ( $allvariables->{'PRODUCTNAME'} eq "" ) { $start = "LibreOffice"; } + + else ( $start = $allvariables->{'PRODUCTNAME'}; } return $start; } -- cgit