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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-03-29 16:47:30 -0500 (Tue, 29 Mar 2011)
New Revision: 4227

Modified:
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
Log:
Added in lines to worker shell script to load bash_profile: on some setups there are important environment variables set e.g. for R library location.


Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-03-28 22:28:46 UTC (rev 4226)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-03-29 21:47:30 UTC (rev 4227)
@@ -15,6 +15,16 @@
   exit 1
 fi
 
+# Load bash profile: may need this to resolve R libraries
+if [ -f ~/.swiftbash_profile ]; then
+    source ~/.swiftbash_profile
+else
+    if [ -f ~/.bash_profile ]; then
+        source ~/.bash_profile
+    fi
+fi
+
+
 # tmp=/tmp # FIXME: allow this to change eg for sites with main tmp dir elsewhere
 # tmp=/scratch/local # FIXME: allow this to change eg for sites with main tmp dir elsewhere
 tmp=${SWIFTR_TMP:-/tmp}