*** empty log message ***

[tools/install.git] / config_files / MULTIPR.sh

diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index f1373804eddc45ef0b709519a8220f3443c1a03b..eeec79882e5eee8b4c3cf4406a31068e781164a9 100755 (executable)
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -14,8 +14,9 @@
 
 check_version(){
 if [ -n "${MULTIPR_ROOT_DIR}" ]; then
-    if [ -f ${MULTIPR_ROOT_DIR}/bin/salome/VERSION ]; then
-       ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
+    check_lib_version VERSION ${MULTIPR_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
+       ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
        if [ "$ver" = "${SALOME_VERSION}" ]; then
            return 0
        fi
@@ -29,21 +30,14 @@ return 1
 }
 
 print_env_bin(){
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MULTIPR_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${MULTIPR_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${MULTIPR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${MULTIPR_ROOT_DIR}/bin/salome:\${MULTIPR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -73,7 +67,7 @@ install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
-
+# unpack
 check_jb tar xfz ${SOURCE_DIR}/MULTIPRsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts