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

[Martin Hollmichel]

 solenv/bin/modules/installer/download.pm |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 6f595a613f79ebf84984a894cdf2dd603b47de20
Author: Martin Hollmichel <martin.hollmichel at gmail.com>
Date:   Mon Jun 29 18:17:22 2015 +0100

    Simplify productname logic.
    
    Change-Id: I55fb371843071943ea7966e42444cc56faee9430
    Reviewed-on: https://gerrit.libreoffice.org/16589
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6b5caab..d62680d 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -301,13 +301,7 @@ sub get_downloadname_productname
 
     my $start = "";
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibreOffice"; }
-
-    elsif ( $allvariables->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { $start = "LibreOfficeDev"; }
-
-    elsif ( $allvariables->{'PRODUCTNAME'} eq "" ) { $start = "LibreOffice"; }
-
-    else  { $start = $allvariables->{'PRODUCTNAME'}; }
+    $start = $allvariables->{'PRODUCTNAME'};
 
     return $start;
 }