To introduce a new possibility - installation of binaries of the prerequisites into...

[tools/install.git] / config_files / ghs3d-4.0.sh

diff --git a/config_files/ghs3d-4.0.sh b/config_files/ghs3d-4.0.sh
index efdea55d4e81233de50a30ae6e3a45bcbc88975e..7796e951dc389b23932555313fc7f2a70c34fe10 100755 (executable)
--- a/config_files/ghs3d-4.0.sh
+++ b/config_files/ghs3d-4.0.sh
@@ -21,7 +21,7 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
-export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\$PATH
+export PATH=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}/DISTENE/Tools/TetMesh-GHS3D4.0/bin:\$PATH
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -35,13 +35,13 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
 # nothing to do
 ##
 EOF
-(test -w ${PRODUCT_DIR}_SRC && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_DIR}_SRC)
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
 try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_DIR}_SRC ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
 
@@ -60,7 +60,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${BIN_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${BIN_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -74,12 +77,13 @@ export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
+REMOVE_SRC_TMP=$9;
 shift
-REMOVE_SRC_TMP=$8;
-shift
-BIN_DIR=$8;
+BIN_DIR=$9;
+test $# == 10 && shift && SINGLE_DIR=$9
 export PRODUCT="ghs3d-4.0"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT}_SRC
 source ./common.sh
 $PROCEDURE