[Swift-commit] r3603 - SwiftApps/SwiftR/Swift/exec

[noreply at svn.ci.uchicago.edu]

Author: wilde
Date: 2010-09-07 11:48:43 -0500 (Tue, 07 Sep 2010)
New Revision: 3603

Modified:
   SwiftApps/SwiftR/Swift/exec/RunSwiftScript.sh
Log:
Move swift script to the run dir.

Modified: SwiftApps/SwiftR/Swift/exec/RunSwiftScript.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/RunSwiftScript.sh	2010-09-05 02:38:34 UTC (rev 3602)
+++ SwiftApps/SwiftR/Swift/exec/RunSwiftScript.sh	2010-09-07 16:48:43 UTC (rev 3603)
@@ -3,10 +3,19 @@
 script=$3
 runR=$4
 
+cp $script $rundir
+
+# FIXME: rework this script to transfer all shells and rscripts
+# needed, and to copy in the R prelude for the R server processes (to
+# incude for example the OpenMx library)
+
 cd $rundir
 
+# FIXME: how to get the right PATH for R in here?
+# use /bin/sh and count on users PATH?
+# then add ENV::PATH as an option, e.g., from options(swift.remotepath and swift.remotepath.sitename)
+
 cat >tc <<EOF
-$site	BadRunR	$runR	null	null	null
 $site	RunR	$runR	null	null	ENV::R_TESTS="";ENV::PATH="$PATH"
 EOF
 
@@ -32,4 +41,5 @@
 </config>
 EOF
 
+script=$(basename $script)
 swift -tc.file tc -sites.file sites.xml $script