strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS nativefixer11 (1.7.78); FILE MERGED

Browse source 
2005/06/20 13:45:02 is 1.7.78.1: #i49736# changing rpm order in language packs
This commit is contained in:
Rüdiger Timm 2005-07-01 11:10:53 +00:00
parent 127dd8d32a
commit 2f514ef061
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
solenv/bin/modules/installer/languagepack.pm
View file

@ -305,21 +305,17 @@ sub put_packagename_into_script
my $installline = "";
if ( $installer::globals::issolarisbuild ) { $installline = " /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
if ( $installer::globals::islinuxrpmbuild ) { $installline = " rpm --prefix \$PRODUCTINSTALLLOCATION -i"; }
for ( my $i = 0; $i <= $#{$allnames}; $i++ )
{
if ( $installer::globals::issolarisbuild )
{
$installline = $installline . " /usr/sbin/pkgadd -d \$outdir -a \$adminfile ${$allnames}[$i]\n";
}
if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
if ( $installer::globals::islinuxrpmbuild )
{
$installline = $installline . " rpm --prefix \$PRODUCTINSTALLLOCATION -i \$outdir/${$allnames}[$i]\n";
}
if ( $installer::globals::islinuxrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
}
$installline =~ s/\s*$//;
for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
{
${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
@ -357,10 +353,6 @@ sub put_linenumber_into_script
my $linenumber = $#{$scriptfile} + $#{$licensefile} + 3; # also adding the content of the license file!
# INSTALLLINES is replaced twice
my $addlines = 2 * $#{$allnames};
$linenumber = $linenumber + $addlines; # The number is also increased by the number of packages
my $infoline = "Adding linenumber $linenumber into language pack script\n";
push( @installer::globals::logfileinfo, $infoline);