The R Project SVN R

Rev

Rev 47462 | Rev 47667 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 47462 Rev 47550
Line 33... Line 33...
33 
use Text::Wrap;
 33 
use Text::Wrap;
34 
 
 34 
 
35 
## Don't buffer output.
 35 
## Don't buffer output.
36 
$| = 1;
 36 
$| = 1;
37 
 
 37 
 
38 
my $revision = ' $Rev: 47462 $ ';
 38 
my $revision = ' $Rev: 47550 $ ';
39 
my $version;
 39 
my $version;
40 
my $name;
 40 
my $name;
41 
$revision =~ / ([\d\.]*) /;
 41 
$revision =~ / ([\d\.]*) /;
42 
$version = $1;
 42 
$version = $1;
43 
($name = $0) =~ s|.*/||;
 43 
($name = $0) =~ s|.*/||;
Line 706... Line 706...
706 
		     !(-t STDIN && -t STDOUT));
 706 
		     !(-t STDIN && -t STDOUT));
707 
		my $INSTALL_opts = "";
 707 
		my $INSTALL_opts = "";
708 
		$INSTALL_opts = "--fake" if($opt_install eq "fake");
 708 
		$INSTALL_opts = "--fake" if($opt_install eq "fake");
709 
		my $cmd;
 709 
		my $cmd;
710 
		if($WINDOWS) {
 710 
		if($WINDOWS) {
- 
 
 711 
		    ## avoid some quoting hell
- 
 
 712 
		    my $pkgd = Win32::GetShortPathName($pkgdir);
711 
		    $cmd = join(" ",
 713 
		    $cmd = join(" ",
712 
				("Rcmd.exe INSTALL -l",
 714 
				("Rcmd.exe INSTALL -l",
713 
				 &shell_quote_file_path($library),
 715 
				 &shell_quote_file_path($library),
714 
				 "$INSTALL_opts",
 716 
				 "$INSTALL_opts",
715 
				 &shell_quote_file_path($pkgdir)));
 717 
				 &shell_quote_file_path($pkgd)));
716 
		} else {
 718 
		} else {
717 
		    $cmd = join(" ",
 719 
		    $cmd = join(" ",
718 
				(&shell_quote_file_path(${R::Vars::R_EXE}),
 720 
				(&shell_quote_file_path(${R::Vars::R_EXE}),
719 
				 "CMD INSTALL -l",
 721 
				 "CMD INSTALL -l",
720 
				 &shell_quote_file_path($library),
 722 
				 &shell_quote_file_path($library),