Changeset 22dc70e in tol

Timestamp:

Dec 15, 2015, 1:14:28 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

7ad36f9

Parents:

da2804ff

Message:

refs #1860 cambiamos /bin/sh por /bin/bash, confenv no aborta en caso de no encontrar R o RInside

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7121 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/bin

Files:

• confenv.sh (modified) (3 diffs)
• tolcon.sh (modified) (1 diff)

tol/bin/confenv.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # create tolenv.sh
 #
@@ -37 +37 @@
 if  command R RHOME >/dev/null 2>/dev/null ; then
   echo "R can be invoked"
+  R_HOME_DIR=$(R RHOME)
+  Rcpp_INSTALLED=$(check_installed Rcpp)
+  Rinside_INSTALLED=$(check_installed RInside)
 else
   echo "R cannot be invoked"
-  exit
 fi
-
-R_HOME_DIR=$(R RHOME)
-Rcpp_INSTALLED=$(check_installed Rcpp)
-Rinside_INSTALLED=$(check_installed RInside)
 
 if [ $Rcpp_INSTALLED -eq 1 ] ; then
@@ -67 +65 @@
 # environment needed for tol processes
 #
-LD_LIBRARY_PATH=$_LD_PATH:\$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$_LD_PATH:\$LD_LIBRARY_PATH
+export TCLLIBPATH=$TOL_PREFIX/lib
+export TOL_LIBRARY=$TOL_PREFIX/bin/stdlib
+EOF
+
+if [ x"$R_HOME_DIR" != x ]; then
+cat << EOF >> $TOLENV
 export R_HOME=$R_HOME_DIR
 EOF
-
+fi

tol/bin/tolcon.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Shell wrapper for TOL executable.