diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-05-13 11:49:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-05-13 13:34:29 +0200 |
| commit | d3942a41d98dbb2d41615c0eac4c39ff9946cd66 (patch) | |
| tree | c9d6739669b1cffc9ba534647602e8be42d26f07 /solenv | |
| parent | 2fe850112624502b2d3c82cc634a73b877ebfb3e (diff) | |
Remove some code that was commented-out ten years ago
Change-Id: Iead0a7e770a5533e3fe4585f76e343f0039328fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94105
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 7c7afe67d513..a0a7163ad31a 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -342,7 +342,6 @@ sub create_package if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; } if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; } my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script"; - # my $scripthelperrealfilename = $volume_name; my $scripthelperrealfilename = $volume_name_classic_app; # Finding both files in source tree @@ -362,7 +361,7 @@ sub create_package my $scriptfilecontent = installer::files::read_file($scriptfilename); my $translationfilecontent = installer::files::read_file($installer::globals::macinstallfilename); localize_scriptfile($scriptfilecontent, $translationfilecontent, $languagestringref); - # replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables); + replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables); installer::files::save_file($scriptfilename, $scriptfilecontent); @@ -384,7 +383,7 @@ sub create_package $destfile = "$contentsfolder/Info.plist"; # Replacing variables in Info.plist $scriptfilecontent = installer::files::read_file($infoplistfile); - # replace_one_variable_in_shellscript($scriptfilecontent, $volume_name, "FULLPRODUCTNAME" ); + replace_one_variable_in_shellscript($scriptfilecontent, $volume_name_classic_app, "FULLAPPPRODUCTNAME" ); # OpenOffice.org Language Pack replace_one_variable_in_shellscript($scriptfilecontent, $ENV{'MACOSX_BUNDLE_IDENTIFIER'}, "BUNDLEIDENTIFIER" ); installer::files::save_file($destfile, $scriptfilecontent); |