From 7950bbe550704cb9751217929e882bc5597b6e74 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 29 Nov 2013 12:54:40 +0000
Subject: [PATCH] SALOME 7.3.0 preparation

---
 config_files/ATOMGEN.sh             |  2 +-
 config_files/ATOMIC.sh              |  2 +-
 config_files/ATOMSOLV.sh            |  2 +-
 config_files/BLSURFPLUGIN.sh        |  2 +-
 config_files/CALCULATOR.sh          |  2 +-
 config_files/COMPONENT.sh           |  2 +-
 config_files/DEBIANFORSALOME-3.1.sh |  8 ++--
 config_files/DISTENE.sh             | 34 +++++++++-------
 config_files/DOCUMENTATION.sh       | 62 +++++++++++++++++++++++++----
 config_files/GEOM.sh                | 30 +++++++-------
 config_files/GHS3DPLUGIN.sh         | 30 +++++++-------
 config_files/GHS3DPRLPLUGIN.sh      | 30 +++++++-------
 config_files/GUI.sh                 | 24 +++++------
 13 files changed, 141 insertions(+), 89 deletions(-)

diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh
index 1fb7e55..d4d9ef5 100755
--- a/config_files/ATOMGEN.sh
+++ b/config_files/ATOMGEN.sh
@@ -82,7 +82,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh
index 4c25221..a60dffd 100755
--- a/config_files/ATOMIC.sh
+++ b/config_files/ATOMIC.sh
@@ -82,7 +82,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index 543a550..644004b 100755
--- a/config_files/ATOMSOLV.sh
+++ b/config_files/ATOMSOLV.sh
@@ -82,7 +82,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 8e12a78..529d4e3 100755
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -83,7 +83,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index d4cdb83..2945af1 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -82,7 +82,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index ea2aba5..8e8775d 100755
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -82,7 +82,7 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
diff --git a/config_files/DEBIANFORSALOME-3.1.sh b/config_files/DEBIANFORSALOME-3.1.sh
index fb3c934..9c086d3 100755
--- a/config_files/DEBIANFORSALOME-3.1.sh
+++ b/config_files/DEBIANFORSALOME-3.1.sh
@@ -20,7 +20,7 @@ return 0
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM} 
 export DEBIANFORSALOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${DEBIANFORSALOME}/bin:\${DEBIANFORSALOME}/bin/X11:\${PATH}
 export LD_LIBRARY_PATH=\${DEBIANFORSALOME}/extralibs:\${DEBIANFORSALOME}/lib:\${DEBIANFORSALOME}/bin/X11:\${LD_LIBRARY_PATH}
@@ -39,7 +39,7 @@ return $?
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
@@ -62,7 +62,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 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="DEBIANLIBS-3.1"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-$PROCEDURE
+${PROCEDURE}
diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index 87d6634..a958d4e 100755
--- a/config_files/DISTENE.sh
+++ b/config_files/DISTENE.sh
@@ -13,15 +13,15 @@
 ####################################################################################
 
 #
-# products versions
+# MeshGems version
 #
-MESHGEMS_VERSION=1.0
-HEXOTIC_VERSION=1.0
+VERSION_MESHGEMS=1.1
+
+# Platform suffuix
 if test `uname -m` = "x86_64" ; then
   PLT_SUFFIX="_64"
 fi
 
-
 check_version(){
 # No way to check version!
 return 0
@@ -30,12 +30,10 @@ return 0
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export DISTENE_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export MESHGEMSHOME=\${DISTENE_HOME}/MeshGems-${MESHGEMS_VERSION}/Products
-export HEXOTICHOME=\${DISTENE_HOME}/Hexotic-${HEXOTIC_VERSION}
-export LD_LIBRARY_PATH=\${MESHGEMSHOME}/lib/Linux${PLT_SUFFIX}:\${LD_LIBRARY_PATH} 
-export PATH=\${MESHGEMSHOME}/bin/Linux${PLT_SUFFIX}:\${HEXOTICHOME}/bin/Linux${PLT_SUFFIX}:\${PATH} 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export MESHGEMS_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/Products
+export LD_LIBRARY_PATH=\${MESHGEMS_ROOT_DIR}/lib/Linux${PLT_SUFFIX}:\${LD_LIBRARY_PATH} 
+export PATH=\${MESHGEMS_ROOT_DIR}/bin/Linux${PLT_SUFFIX}:\${PATH} 
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -45,7 +43,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
@@ -67,12 +65,18 @@ echo "It's impossible to install ${PRODUCT} from sources"
 install_source_and_build()
 {
 install_binary
+
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+    echo "0" > ${INST_ROOT}/${PRODUCT_TYPE}.src.size
+    du -sk ${PRODUCT_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.bin.size
+    cp ${INST_ROOT}/${PRODUCT_TYPE}.bin.size ${INST_ROOT}/${PRODUCT_TYPE}.build.size
+fi
 }
 
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
@@ -94,10 +98,10 @@ SRC_DIR=$8;
 REMOVE_SRC_TMP=$9;
 shift
 BIN_DIR=$9;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="DISTENE"
+test $# = 10 && shift && SINGLE_DIR=$9
+export PRODUCT="MeshGems-${VERSION_MESHGEMS}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
 source ./common.sh
-$PROCEDURE 
+${PROCEDURE} 
diff --git a/config_files/DOCUMENTATION.sh b/config_files/DOCUMENTATION.sh
index c6da043..44df1ec 100755
--- a/config_files/DOCUMENTATION.sh
+++ b/config_files/DOCUMENTATION.sh
@@ -18,20 +18,28 @@ return 0
 }
 
 print_env_bin(){
-return 1
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export DOCUMENTATION_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+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
-export DOCUMENTATION_ROOT_DIR=\${INST_ROOT}/${PRODUCT_SRC}
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
+export DOCUMENTATION_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
+
 (test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
@@ -39,9 +47,9 @@ 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}/DOCUMENTATIONsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/DOCUMENTATIONsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -49,12 +57,49 @@ try_preinstalled
 
 install_source_and_build()
 {
+# install sources
 install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
+    cp -f ./build.sh ${INST_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INST_ROOT}
+check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} DOCUMENTATION
+
+cd ${CUR_DIR}
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+    test -d ${INST_ROOT}/"DOCUMENTATION_BUILD" && rm -fr ${INST_ROOT}/"DOCUMENTATION_BUILD"
+fi
+
+# to generate environment scripts
+try_preinstalled
 }
 
 install_binary()
 {
-install_source
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/${SHRC}
+
+# create a module directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/DOCUMENTATIONbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/DOCUMENTATIONsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# modify all *.la files
+export DOCUMENTATION_ROOT_DIR=${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
+
+# to generate environment scripts
+try_preinstalled
 }
 
 source ./common.sh
@@ -68,9 +113,12 @@ export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
+REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
 export PRODUCT="DOCUMENTATION_${SALOME_VERSION}"
 export PRODUCT_SRC="DOCUMENTATION_SRC_${SALOME_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE} 
diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 25ca466..f1bf210 100755
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -16,8 +16,8 @@ check_version(){
 if [ -n "${GEOM_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GEOM_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
-	ver=`cat ${GEOM_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	ver=`head -n1 ${GEOM_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+	if [ "${ver}" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -31,7 +31,7 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export GEOM_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
@@ -48,7 +48,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 GEOM_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -66,7 +66,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 ${SOURCE_DIR}/GEOMsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -82,22 +82,22 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-if [ $INST_WITH_GUI == "FALSE" ] ; then
-    check_jb ./build.sh -o -b -w -d -v 0 -p $INST_ROOT GEOM
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
+    check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GEOM
 else
-    check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT GEOM
+    check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GEOM
 fi
 
-cd $CUR_DIR
+cd ${CUR_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}
     test -d ${INST_ROOT}/"GEOM_BUILD" && rm -fr ${INST_ROOT}/"GEOM_BUILD"
 fi
@@ -109,12 +109,12 @@ 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}
 
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/GEOMWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
@@ -145,9 +145,9 @@ shift
 INST_WITH_GUI=$9;
 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="GEOM_${SALOME_VERSION}"
 export PRODUCT_SRC="GEOM_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE} 
diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index 8642c0b..719700f 100755
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -16,8 +16,8 @@ check_version(){
 if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GHS3DPLUGIN_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
-	ver=`cat ${GHS3DPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	ver=`head -n1 ${GHS3DPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+	if [ "${ver}" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -32,7 +32,7 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export GHS3DPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
@@ -48,7 +48,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 GHS3DPLUGIN_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -66,7 +66,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 ${SOURCE_DIR}/GHS3DPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -82,22 +82,22 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-if [ $INST_WITH_GUI == "FALSE" ] ; then
-    check_jb ./build.sh -o -b -w -d -v 0 -p $INST_ROOT GHS3DPLUGIN
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
+    check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GHS3DPLUGIN
 else
-    check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT GHS3DPLUGIN
+    check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GHS3DPLUGIN
 fi
 
-cd $CUR_DIR
+cd ${CUR_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}
     test -d ${INST_ROOT}/"GHS3DPLUGIN_BUILD" && rm -fr ${INST_ROOT}/"GHS3DPLUGIN_BUILD"
 fi
@@ -109,12 +109,12 @@ 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}
 
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
@@ -145,9 +145,9 @@ shift
 INST_WITH_GUI=$9;
 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="GHS3DPLUGIN_${SALOME_VERSION}"
 export PRODUCT_SRC="GHS3DPLUGIN_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE} 
diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index a3aa1a9..34aeacb 100755
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -15,8 +15,8 @@
 check_version(){
 if [ -n "${GHS3DPRLPLUGIN_ROOT_DIR}" ]; then
     if [ -f ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome/VERSION ]; then
-	ver=`cat ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	ver=`head -n1 ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+	if [ "${ver}" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -30,7 +30,7 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export GHS3DPRLPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
@@ -47,7 +47,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 GHS3DPRLPLUGIN_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -65,7 +65,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 ${SOURCE_DIR}/GHS3DPRLPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -81,22 +81,22 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-if [ $INST_WITH_GUI == "FALSE" ] ; then
-    check_jb ./build.sh -o -b -w -d -v 0 -p $INST_ROOT GHS3DPRLPLUGIN
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
+    check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GHS3DPRLPLUGIN
 else
-    check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT GHS3DPRLPLUGIN
+    check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GHS3DPRLPLUGIN
 fi
 
-cd $CUR_DIR
+cd ${CUR_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}
     test -d ${INST_ROOT}/"GHS3DPRLPLUGIN_BUILD" && rm -fr ${INST_ROOT}/"GHS3DPRLPLUGIN_BUILD"
 fi
@@ -108,12 +108,12 @@ 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}
 
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
@@ -144,9 +144,9 @@ shift
 INST_WITH_GUI=$9;
 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="GHS3DPRLPLUGIN_${SALOME_VERSION}"
 export PRODUCT_SRC="GHS3DPRLPLUGIN_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE} 
diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index c0a9442..995b261 100755
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -16,8 +16,8 @@ check_version(){
 if [ -n "${GUI_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GUI_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
-	ver=`cat ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	ver=`head -n1 ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+	if [ "${ver}" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -31,7 +31,7 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export GUI_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
@@ -49,7 +49,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 GUI_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -67,7 +67,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 ${SOURCE_DIR}/GUIsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -83,18 +83,18 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT GUI
+check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GUI
 
-cd $CUR_DIR
+cd ${CUR_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}
     test -d ${INST_ROOT}/"GUI_BUILD" && rm -fr ${INST_ROOT}/"GUI_BUILD"
 fi
@@ -106,7 +106,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}
@@ -136,9 +136,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="GUI_${SALOME_VERSION}"
 export PRODUCT_SRC="GUI_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE} 
-- 
2.30.2