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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-04-12 09:23:49 -0500 (Tue, 12 Apr 2011)
New Revision: 4338

Modified:
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
Log:
Removed attempt to run .bashrc - turned out to have bad side effects on some configurations.  Better solution is to use softenv or simiplar system.


Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-04-12 13:39:36 UTC (rev 4337)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-04-12 14:23:49 UTC (rev 4338)
@@ -15,16 +15,6 @@
   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:-/tmp}}