summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorYiiChang Yen <sadwind.yan@gmail.com>2014-10-23 14:59:06 +0800
committerCaolán McNamara <caolanm@redhat.com>2014-10-30 14:29:26 +0000
commit3bfd60a1dc138f1910529bd15043ec731525d572 (patch)
tree2f352dd52a748e55ddd60307cd8765d6e9936f17 /solenv
parent1e48bfafdd25d595a2265a5bc66230f3681e96b5 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/download.pm10
1 files changed, 7 insertions, 3 deletions
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;
}