diff options
Diffstat (limited to 'solenv/bin/modules/installer/windows/createfolder.pm')
| -rw-r--r-- | solenv/bin/modules/installer/windows/createfolder.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm index cc3d87e47bb7..ab1c4f7e7721 100644 --- a/solenv/bin/modules/installer/windows/createfolder.pm +++ b/solenv/bin/modules/installer/windows/createfolder.pm @@ -94,10 +94,14 @@ sub get_createfolder_component my $globalfilegid = $allvariableshashref->{'GLOBALFILEGID'}; if ( $installer::globals::patch ) { $globalfilegid = $allvariableshashref->{'GLOBALPATCHFILEGID'}; } - my $onefile = ""; + my $onefile; if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); } - elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); } - else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); } + elsif ( $installer::globals::helppack ) { ($onefile) = grep {$_->{gid} eq 'gid_File_Help_Common_Zip'} @{$filesref} } + else { ($onefile) = grep {$_->{gid} eq $globalfilegid} @{$filesref} } + + if (! defined $onefile) { + installer::exiter::exit_program("ERROR: Could not find file!", "get_createfolder_component"); + } return $onefile->{'componentname'}; } |