changeset 4:a9dd528555bb draft

Uploaded
author davidvanzessen
date Thu, 26 Sep 2013 08:55:07 -0400
parents 098c148559ca
children 103006a53888
files r_wrapper.sh tool_dependencies.xml
diffstat 2 files changed, 1 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/r_wrapper.sh	Wed Sep 25 09:23:39 2013 -0400
+++ b/r_wrapper.sh	Thu Sep 26 08:55:07 2013 -0400
@@ -1,4 +1,4 @@
 #!/bin/bash
 dir="$(cd "$(dirname "$0")" && pwd)"
-$R_LOCATION/bin/Rscript --verbose $dir/RScript.r $1 "$2.png" 2>&1
+Rscript --verbose $dir/RScript.r $1 "$2.png" 2>&1
 mv -f "$2.png" $2
--- a/tool_dependencies.xml	Wed Sep 25 09:23:39 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<tool_dependency>
-	<set_environment version="1.0">            
-    </set_environment>
-    
-	<package name="R" version="3.0.1"> 
-        <install version="1.0">
-            <actions>
-            	<action type="download_by_url" target_filename="R-3.0.1.tar.gz">
-            		http://cran.rstudio.com/src/base/R-3/R-3.0.1.tar.gz
-            	</action>
-                <action type="shell_command">./configure --with-x=no</action>
-                <action type="shell_command">make</action>               	
-            	
-            	<action type="move_directory_files">
-		    		<source_directory>.</source_directory>
-			   		<destination_directory>$INSTALL_DIR/R-3.0.1</destination_directory>
-	       		</action>
-             
-                <action type="set_environment">
-                	<environment_variable name="R_LOCATION" action="set_to">$INSTALL_DIR/R-3.0.1</environment_variable>
-                </action>
-    		</actions>
-        </install>
-        <readme>
-			Download and configure R.
-        </readme>
-    </package>
-</tool_dependency>