diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-31 21:59:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-31 21:59:04 +0100 |
| commit | 2208fca2feb0360af95c7cb1bbe663577084bd15 (patch) | |
| tree | 373987f03328d306a17b59da7869f72f228f7a65 /solenv/bin/modules/installer | |
| parent | dd08ef89d53831246acefcd7c14d00b3c3da4e0f (diff) | |
$installer::globals::macinstallfilename is already an absolute pathname
Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c
Diffstat (limited to 'solenv/bin/modules/installer')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 8ed693fe4414..da58b40753f2 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -345,15 +345,12 @@ sub create_package my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script"; # my $scripthelperrealfilename = $volume_name; my $scripthelperrealfilename = $volume_name_classic_app; - my $translationfilename = $installer::globals::macinstallfilename; # Finding both files in source tree my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename; if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); } if (! -f $scripthelperfilename) { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelperfilename!", "create_package"); } - my $translationfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$translationfilename, $includepatharrayref, 0); - if ($$translationfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script translation file $translationfilename ( includepatharrayref = $includepatharrayref )", "create_package"); } $scriptfilename = $contentsfolder . "/" . $scriptrealfilename; $scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename; @@ -364,7 +361,7 @@ sub create_package # Replacing variables in script $scriptfilename # Localizing script $scriptfilename my $scriptfilecontent = installer::files::read_file($scriptfilename); - my $translationfilecontent = installer::files::read_file($$translationfileref); + 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); |