summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/download.pm
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-30 16:24:45 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-31 10:42:22 +0100
commitee27b235f620b09845f6909fffad6bb120222464 (patch)
tree0c3501a780cebbf69b30d9b8966785397362cbea /solenv/bin/modules/installer/download.pm
parentbdd97ec6ee5ad96fd2452ce99b3ebd28e540629a (diff)
setup_native: use various scripts directly from SRCDIR
Change-Id: I6c53fed0a4eace9b306ce0ab425f16fa0ca7d7b3
Diffstat (limited to 'solenv/bin/modules/installer/download.pm')
-rw-r--r--solenv/bin/modules/installer/download.pm19
1 files changed, 4 insertions, 15 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6f83943d7ad7..4d3bd6745ac2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -741,23 +741,12 @@ sub create_download_sets
else
{
# find and read setup script template
- my $scriptfilename = "downloadscript.sh";
+ my $scriptfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/downloadscript.sh";
- my $scriptref = "";
+ if (! -f $scriptfilename) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
+ my $scriptfile = installer::files::read_file($scriptfilename);
- if ( $installer::globals::include_paths_read )
- {
- $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
- }
- else
- {
- $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$scriptfilename, $includepatharrayref, 0);
- }
-
- if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
- my $scriptfile = installer::files::read_file($$scriptref);
-
- $infoline = "Found script file $scriptfilename: $$scriptref \n";
+ $infoline = "Found script file $scriptfilename \n";
push( @installer::globals::logfileinfo, $infoline);
# add product name into script template