[Rcolony-commits] r8 - in pkg: . R

[noreply at r-forge.r-project.org]

Author: jonesor
Date: 2009-04-20 14:27:34 +0200 (Mon, 20 Apr 2009)
New Revision: 8

Modified:
   pkg/DESCRIPTION
   pkg/R/run.colony.R
Log:
Removed blank line in DESCRIPTION that was causing build to fail.

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-04-20 10:30:34 UTC (rev 7)
+++ pkg/DESCRIPTION	2009-04-20 12:27:34 UTC (rev 8)
@@ -6,6 +6,5 @@
 Author: Owen R. Jones
 Maintainer: Owen R. Jones <owen.jones at ioz.ac.uk>
 Description: The RColony package provides tools for the implementation of the Colony pedigree analysis software. In addition it provides tools for visualising, and summarising the results of the Colony analyses.
-
 License: GNU General Public License (GPL)
 LazyLoad: yes

Modified: pkg/R/run.colony.R
===================================================================
--- pkg/R/run.colony.R	2009-04-20 10:30:34 UTC (rev 7)
+++ pkg/R/run.colony.R	2009-04-20 12:27:34 UTC (rev 8)
@@ -26,15 +26,15 @@
 	system(paste("cp",paste(colonypath,colonyexec,sep=""),datadir,sep=" "))
 	system(paste("mv",paste(datadir,filename,sep=""),paste(datadir,"Colony2.DAT",sep=""),sep=" "))
 
-system("./Colony2.exe",wait=wait)
+system("./Colony2.exe 2>&1 | tee foo.txt",wait=wait)
 #capture.output(system("./Colony2.exe",wait=wait,intern=TRUE),file="Test.txt")
 
 	system(paste("mv",paste(datadir,"Colony2.DAT",sep=""),paste(datadir,filename,sep=""),sep=" "))
 	system("rm Colony2.exe")
 
 
+2 > &1 | tee foo.txt
 
-
 	 }else{if(platform$OS.type=="windows"){
 	#Windows commands
 	shell(paste("copy",paste(colonypath,colonyexec,sep=""),datadir,sep=" "))#Copy the colony exe file to the project directory