The R Project SVN R

Rev

Rev 36401 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36401 Rev 36443
Line 423... Line 423...
423 
		    else {
 423 
		    else {
424 
			$cmd .= " >" .
 424 
			$cmd .= " >" .
425 
			    &shell_quote_file_path($out) .
 425 
			    &shell_quote_file_path($out) .
426 
			    " 2>&1";
 426 
			    " 2>&1";
427 
			$install_error = &R_system($cmd);
 427 
			$install_error = &R_system($cmd);
- 
 
 428 
			if($WINDOWS) {
- 
 
 429 
			    ## MS Html Help Compiler gives lines terminated
- 
 
 430 
			    ## by CRCRLF, so we clean up the log file.
- 
 
 431 
			    my $line;
- 
 
 432 
			    ## read_lines does chomp.
- 
 
 433 
			    @lines = &read_lines($out);
- 
 
 434 
			    open(FILE, "> $out")
- 
 
 435 
				or die "Error: cannot open file '$out' for re-writing\n";
- 
 
 436 
			    foreach $line (@lines) {
- 
 
 437 
				$line =~ s/\r$//;
- 
 
 438 
				print FILE $line, "\n";
- 
 
 439 
			    }
- 
 
 440 
			    close(FILE);
- 
 
 441 
			}
428 
		    }
 442 
		    }
429 
		    ## <FIXME>
 - 
 
430 
		    ## Possibly tidy up the install log here.
 - 
 
431 
		    ## E.g., MS HHC gives lines terminated by CRCRLF.
 - 
 
432 
		    ## </FIXME>
 - 
 
433 
		    if($install_error) {
 443 
		    if($install_error) {
434 
			$log->error();
 444 
			$log->error();
435 
			$log->print("Installation failed.\n");
 445 
			$log->print("Installation failed.\n");
436 
			$log->print("See '$out' for details.\n");
 446 
			$log->print("See '$out' for details.\n");
437 
			exit(1);
 447 
			exit(1);