diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-06-05 19:23:47 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-06-05 19:25:14 +0300 |
| commit | d223659093f487ffc44e2fd00f3efa69d39a6c55 (patch) | |
| tree | 3da9d7a441cfbe1eda89643ef30e16c1563e6631 /solenv | |
| parent | a2fde7c953e5f085e2b696cea1e243c649cf6a86 (diff) | |
Revert "Collabora branding"
Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.
This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7.
Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 35793a366643..9c61d66d4cd3 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -270,7 +270,7 @@ sub create_package my $volume_name = $allvariables->{'PRODUCTNAME'}; my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; - my $volume_name_classic_app = 'LibreOffice from Collabora'; # "app" should not contain version number + my $volume_name_classic_app = $volume_name; # "app" should not contain version number if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) { $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; @@ -411,10 +411,10 @@ sub create_package } else { - if (($volume_name_classic_app eq 'LibreOffice from Collabora' || $volume_name_classic_app eq 'LibreOfficeDev') && + if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') && defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" ) { - $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle \"$localtempdir/$folder/$volume_name_classic_app.app\""; + $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle $localtempdir/$folder/$volume_name_classic_app.app"; print "... $systemcall ...\n"; my $returnvalue = system($systemcall); $infoline = "Systemcall: $systemcall\n"; |