Prepare SALOME 7.3.0

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

diff --git a/config_files/xdata.sh b/config_files/xdata.sh
index 451b8eb08fea9855ded88bd3b58da41abcccbcc4..c195d19666a15293834759d679d9a8bd3340b919 100755 (executable)
--- a/config_files/xdata.sh
+++ b/config_files/xdata.sh
@@ -25,7 +25,7 @@ return 0
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM} 
 export XDATAROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${XDATAROOT}/bin:\${PATH}
 export PYTHONPATH=\${XDATAROOT}/lib/python\${PYTHON_VERSION}/site-packages/xdata:\${PYTHONPATH}
@@ -38,7 +38,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}
 # nothing to do
 ##
 EOF
@@ -55,7 +55,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}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
@@ -76,7 +76,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
+used gcc=${GCC}
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
@@ -84,7 +84,7 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 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
 
@@ -95,7 +95,7 @@ try_preinstalled
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
@@ -120,8 +120,8 @@ 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="xdata-${XDATA_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-$PROCEDURE
+${PROCEDURE}