set manufacturer name to OOO_VENDOR or else to USERNAME

1 files changed, 11 insertions, 4 deletions

diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index bef3182dca18..cbbe6637a2fb 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -632,12 +632,19 @@ sub list_all_files_from_include_path
 sub set_manufacturer
 {
     my ($allvariables) = @_;
+    my $manufacturer;
 
-    my $openofficeproductname = "LibreOffice";
-    my $sunname = "";
+    if ( $ENV{'OOO_VENDOR'} ne "" )
+    {
+        $manufacturer = $ENV{'OOO_VENDOR'};
+    }
+    else
+    {
+        $manufacturer = $ENV{'USERNAME'};
+    }
 
-    $installer::globals::manufacturer = $openofficeproductname;
-    $installer::globals::longmanufacturer = $openofficeproductname;
+    $installer::globals::manufacturer = $manufacturer;
+    $installer::globals::longmanufacturer = $manufacturer;
 
     $allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
 }