Kaydet (Commit) 2208fca2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

$installer::globals::macinstallfilename is already an absolute pathname

Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c
üst dd08ef89
...@@ -345,15 +345,12 @@ sub create_package ...@@ -345,15 +345,12 @@ sub create_package
my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script"; my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script";
# my $scripthelperrealfilename = $volume_name; # my $scripthelperrealfilename = $volume_name;
my $scripthelperrealfilename = $volume_name_classic_app; my $scripthelperrealfilename = $volume_name_classic_app;
my $translationfilename = $installer::globals::macinstallfilename;
# Finding both files in source tree # Finding both files in source tree
my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename; 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 $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"); } 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; $scriptfilename = $contentsfolder . "/" . $scriptrealfilename;
$scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename; $scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename;
...@@ -364,7 +361,7 @@ sub create_package ...@@ -364,7 +361,7 @@ sub create_package
# Replacing variables in script $scriptfilename # Replacing variables in script $scriptfilename
# Localizing script $scriptfilename # Localizing script $scriptfilename
my $scriptfilecontent = installer::files::read_file($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); localize_scriptfile($scriptfilecontent, $translationfilecontent, $languagestringref);
# replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables); # replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables);
replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables); replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment