diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-07-06 13:55:31 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-06 13:55:31 +0000 |
commit | 9deeecf249c9c8088c7a840c1e475b3364d35b54 (patch) | |
tree | 8da3d6b7fd0e76c1ba6311764805ce884016af92 /solenv/bin/modules/installer/archivefiles.pm | |
parent | 7a788147ad84ce2614e61fb4e0c8101a166b5f22 (diff) |
INTEGRATION: CWS nativesmoker (1.4.6); FILE MERGED
2004/06/30 17:34:10 is 1.4.6.2: #i30826# removing content of output tree
Issue number:
Submitted by:
Reviewed by:
2004/06/29 13:09:41 is 1.4.6.1: #i30828# less terminal output
Issue number:
Submitted by:
Reviewed by:
Diffstat (limited to 'solenv/bin/modules/installer/archivefiles.pm')
-rw-r--r-- | solenv/bin/modules/installer/archivefiles.pm | 52 |
1 files changed, 20 insertions, 32 deletions
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index f85af1028a8b..0ad20d543de9 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -2,9 +2,9 @@ # # $RCSfile: archivefiles.pm,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2004-06-22 10:20:24 $ +# last change: $Author: rt $ $Date: 2004-07-06 14:55:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,9 +86,8 @@ sub resolving_archive_flag my $unziplistfile = $loggingdir . "unziplist_" . $installer::globals::build . "_" . $installer::globals::compiler . "_" . $$languagestringref . ".txt"; - # no more common unzipping, because of race conditions - # my $commonunzipdirbase = installer::systemactions::create_directories("unzip", ""); # for zip files from common directory - my $platformunzipdirbase = installer::systemactions::create_directories("zipfiles", ""); # for zip files from common directory + my $platformunzipdirbase = installer::systemactions::create_directories("zipfiles", $languagestringref); + push(@installer::globals::removedirs, $platformunzipdirbase); installer::logger::include_header_into_logfile("Files with flag ARCHIVE:"); @@ -131,13 +130,6 @@ sub resolving_archive_flag $onefilename =~ s/\//\_/g; # only because of /letter/fontunxpsprint.zip, the only zip file with path $unzipdir = $unzipdir . $onefilename . $installer::globals::separator; - my $already_unzipped = 0; - - if ( -d $unzipdir ) - { - $already_unzipped = 1; # to save time and not to unzip more than once - } - if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); } # creating subdirectories with the names of the zipfiles @@ -158,37 +150,33 @@ sub resolving_archive_flag else { # now really unpacking the files + # Parameter -o : overwrite files without prompting + # Parameter -q : quiet mode if ( $installer::globals::dounzip ) # really unpacking the files { - if (!($already_unzipped)) # only unzip if the directory does not exist already (to save time) + $returnvalue = 1; + $systemcall = "$installer::globals::unzippath -o -q $sourcepath -d $unzipdir"; + $returnvalue = system($systemcall); + + $infoline = "Systemcall: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); + + if ($returnvalue) { installer::exiter::exit_program("ERROR: $infoline", "resolving_archive_flag"); } + + if ( ! $installer::globals::iswindowsbuild ) { - $returnvalue = 1; - $systemcall = "$installer::globals::unzippath $sourcepath -d $unzipdir"; - $returnvalue = system($systemcall); + # Setting unix rights to "775" for all created directories inside the package + $systemcall = "cd $unzipdir; find . -type d -exec chmod 775 \{\} \\\;"; + $returnvalue = system($systemcall); $infoline = "Systemcall: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); if ($returnvalue) { - installer::exiter::exit_program("ERROR: $infoline", "resolving_archive_flag"); - } - - if ( ! $installer::globals::iswindowsbuild ) - { - # Setting unix rights to "775" for all created directories inside the package - - $systemcall = "cd $unzipdir; find . -type d -exec chmod 775 \{\} \\\;"; - $returnvalue = system($systemcall); - $infoline = "Systemcall: $systemcall\n"; + $infoline = "ERROR: Could not execute \"$systemcall\"!\n"; push( @installer::globals::logfileinfo, $infoline); - - if ($returnvalue) - { - $infoline = "ERROR: Could not execute \"$systemcall\"!\n"; - push( @installer::globals::logfileinfo, $infoline); - } } } } |