Changeset a96b184 in tol

Timestamp:

Nov 20, 2015, 1:01:15 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

a6c2559

Parents:

39b4013

Message:

refs #1860, por omisión se genera el archivo /bin/tolenv.sh si se omite el segundo argumento

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

File:

• tol/confenv.sh (modified) (4 diffs)

tol/confenv.sh

@@ -18 +18 @@
 }
 
-if [ $# -ne 2 ]; then
-  echo "usage: $0 dir output.sh"
+if [ $# -eq 1 ]; then
+  TOL_PREFIX=$1
+  TOLENV=$1/bin/tolenv.sh
+elif [ $# -eq 2 ]; then
+  TOL_PREFIX=$1
+  TOLENV=$2
+else
+  echo "usage: $0 TOL_PREFIX_DIR ?tolenv.sh?"
   exit
 fi
 
-# check if dir provided is a tol installation
-#
-
-check_tol_program $1 bin/tolcon
-check_tol_program $1 bin/tolsh
+check_tol_program $TOL_PREFIX bin/tolcon
+check_tol_program $TOL_PREFIX bin/tolsh
 
 # look for R
@@ -43 +46 @@
 Rinside_INSTALLED=$(check_installed RInside)
 
-echo Rcpp_INSTALLED=$Rcpp_INSTALLED
-echo Rinside_INSTALLED=$Rinside_INSTALLED
-
 if [ $Rcpp_INSTALLED -eq 1 ] ; then
   echo "Rcpp is installed"
@@ -59 +59 @@
 fi
 
-_LD_PATH=$1/lib:$R_HOME_DIR/lib
+_LD_PATH=$TOL_PREFIX/lib:$R_HOME_DIR/lib
 if [ x"$RINSIDE_PATH" != x ]; then
  _LD_PATH=$_LD_PATH:$RINSIDE_PATH/lib
 fi
 
-cat << EOF > $2
+cat << EOF > $TOLENV
 # environment needed for tol processes
 #
@@ -72 +72 @@
 EOF
 
-