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

INTEGRATION: CWS sdkinstaller (1.24.12); FILE MERGED

Browse source 
2005/11/03 10:40:40 is 1.24.12.2: #124595# problems with files with $ in their name
2005/10/28 13:28:34 is 1.24.12.1: #i56859# java product for all platforms
This commit is contained in:
Rüdiger Timm 2005-11-09 08:10:24 +00:00
parent 748d23353b
commit c805fd6ebe
1 changed files with 53 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
solenv/bin/modules/installer/scriptitems.pm
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: scriptitems.pm,v $ # $RCSfile: scriptitems.pm,v $
# #
# $Revision: 1.24 $ # $Revision: 1.25 $
# #
# last change: $Author: hr $ $Date: 2005-09-28 13:15:09 $ # last change: $Author: rt $ $Date: 2005-11-09 09:10:24 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -1354,12 +1354,49 @@ sub remove_patchonlyfiles_from_Installset
} }
############################################################################ ############################################################################
# FAKE: Some files cotain a $ in their name. epm conflicts with such files. # Removing all files with flag TAB_ONLY from installation set.
# Quick solution: Renaming this files, converting "$" to "_" # This function is not called during tab creation.
# Still a ToDo ! :-)
############################################################################ ############################################################################
sub rename_illegal_filenames sub remove_tabonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset : $#{$itemsarrayref}"); }
my $infoline;
my @newitemsarray = ();
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
{
my $oneitem = ${$itemsarrayref}[$i];
my $styles = "";
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
if ( $styles =~ /\bTAB_ONLY\b/ )
{
$infoline = "Removing tab only file $oneitem->{'gid'} from the installation set.\n";
push( @installer::globals::globallogfileinfo, $infoline);
next;
}
push(@newitemsarray, $oneitem);
}
$infoline = "\n";
push( @installer::globals::globallogfileinfo, $infoline);
return \@newitemsarray;
}
############################################################################
# Some files cotain a $ in their name. epm conflicts with such files.
# Solution: Renaming this files, converting "$" to "$$"
############################################################################
sub quoting_illegal_filenames
{ {
my ($filesarrayref) = @_; my ($filesarrayref) = @_;
@ -1379,26 +1416,22 @@ sub rename_illegal_filenames
my $sourcepath = $onefile->{'sourcepath'}; my $sourcepath = $onefile->{'sourcepath'};
my $destpath = $onefile->{'destination'}; my $destpath = $onefile->{'destination'};
$filename =~ s/\$/\_/g; # sourcepath and destination have to be quoted for epm list file
$destpath =~ s/\$/\_/g;
my $oldsourcepath = $sourcepath;
$sourcepath =~ s/\$/\_/g;
my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n"; # $filename =~ s/\$/\$\$/g;
$destpath =~ s/\$/\$\$/g;
$sourcepath =~ s/\$/\$\$/g;
# my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n";
# push( @installer::globals::logfileinfo, $infoline);
my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
$infoline = "ATTENTION: Files: Renaming $onefile->{'sourcepath'} to $sourcepath\n"; $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n";
push( @installer::globals::logfileinfo, $infoline);
$infoline = "ATTENTION: Files: Renaming $onefile->{'destination'} to $destpath\n";
push( @installer::globals::logfileinfo, $infoline); push( @installer::globals::logfileinfo, $infoline);
$onefile->{'Name'} = $filename; # $onefile->{'Name'} = $filename;
$onefile->{'sourcepath'} = $sourcepath; $onefile->{'sourcepath'} = $sourcepath;
$onefile->{'destination'} = $destpath; $onefile->{'destination'} = $destpath;
if (! -f $sourcepath)
{
installer::systemactions::copy_one_file($oldsourcepath, $sourcepath);
}
} }
} }
} }