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

CWS-TOOLING: integrate CWS smoketest23

Browse source 
2009-07-27 14:24:59 +0200 kz  r274367 : #159577# correct permission after calling admin.pm
2009-07-22 15:45:19 +0200 kz  r274245 : #159577# create path before calling admin.pm
2009-07-10 17:45:31 +0200 kz  r273904 : #159577# fix for cygwin
2009-07-10 17:41:12 +0200 kz  r273903 : #159577# dif. lineend fixed
2009-07-01 17:32:09 +0200 kz  r273608 : #159577# an exithandler can be used from smoketest
2009-07-01 17:27:50 +0200 kz  r273607 : #159577# now smoketest can use admin.pm for installation on windows
This commit is contained in:
Jens-Heiner Rechtien 2009-07-28 16:16:54 +00:00
parent 90a66af660
commit 97386ba33e
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
solenv/bin/modules/installer/exiter.pm
View file

@ -107,6 +107,10 @@ sub exit_program
installer::logger::stoptime();
if (defined($installer::globals::exithandler)) {
&$installer::globals::exithandler;
}
exit(-1);
}

2
solenv/bin/modules/installer/globals.pm
View file

@ -477,6 +477,8 @@ BEGIN
@emptypackages = ();
%fontpackageexists = ();
$exithandler = undef;
$plat = $^O;
if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))

3
solenv/bin/modules/installer/windows/admin.pm
View file

@ -79,10 +79,11 @@ sub unpack_cabinet_file
my $systemcall = "";
if ( $^O =~ /cygwin/i ) {
my $localunpackdir = qx{cygpath -w "$unpackdir"};
chomp ($localunpackdir);
$localunpackdir =~ s/\\/\\\\/g;
$cabfilename =~ s/\\/\\\\/g;
$cabfilename =~ s/\s*$//g;
$systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir;
$systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir . " \> " . $expandlogfile;
}
else
{