[Libreoffice-commits] core.git: solenv/bin

[YiiChang Yen]

 solenv/bin/modules/installer/download.pm |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 3bfd60a1dc138f1910529bd15043ec731525d572
Author: YiiChang Yen <sadwind.yan at gmail.com>
Date:   Thu Oct 23 14:59:06 2014 +0800

    Setting download name: To let other product name can pass to $start
    
    Because the product name may be others.
    
    Change-Id: I2cd60fd029c7a75b8018b681303aa2883cd3dc97
    Reviewed-on: https://gerrit.libreoffice.org/12074
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index d9b3d46..017d048 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;
 }