Update patch for ParaView 4.1: add fix for issue 0022593: [CEA 1175] PARAVIS segmenta...

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

diff --git a/config_files/YACSGEN.sh b/config_files/YACSGEN.sh
index 1d121d564310066a8d51227706436b120a22815f..d3f6f3ed4999c9bfa3782b1b293fad799d7b59d7 100755 (executable)
--- a/config_files/YACSGEN.sh
+++ b/config_files/YACSGEN.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -17,7 +17,7 @@ if [ -n "${YACSGEN_SRC_DIR}" ]; then
     cfg_file=setup.py   
     if [ -f ${YACSGEN_SRC_DIR}/${cfg_file} ] ; then
        ver=`grep -e "version=" ${YACSGEN_SRC_DIR}/${cfg_file} | sed s/\'/" "/g | awk '{print $2}'`
-       if [ "$ver" = "${YACSGEN_VERSION}" ]; then
+       if [ "${ver}" = "${YACSGEN_VERSION}" ]; then
            return 0
        fi
     fi
@@ -27,7 +27,7 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export YACSGEN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
@@ -42,7 +42,7 @@ make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}
 
 print_env_src(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
 export YACSGEN_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -60,7 +60,7 @@ return $?
 install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 check_jb tar xfz ${SRC_DIR}/YACSGENsourcesV${YACSGEN_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -83,7 +83,7 @@ check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_D
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
 fi
 
@@ -110,9 +110,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
 export PRODUCT="YACSGEN_${YACSGEN_VERSION}"
 export PRODUCT_SRC="YACSGEN_SRC_${YACSGEN_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE}