SALOME 6.5.0 preparation: graphviz 2.26.3 -> 2.28.0

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

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index b1400998cab57aaf37699385ff75ca7f4de732db..d8f8e9036de4eef2f09d99de86f41a13e7f5edaf 100755 (executable)
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -29,21 +29,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 YACS_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
-  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
     export PATH=\${YACS_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${YACS_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${YACS_ROOT_DIR}/bin/salome:\${YACS_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${YACS_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${YACS_ROOT_DIR}/bin/salome:\${YACS_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -94,7 +87,7 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-if [ $INST_WITH_GUI == "FALSE" ] ; then
+if [ "$INST_WITH_GUI" = "FALSE" ] ; then
     check_jb ./build.sh -o -b -w -d -v 0 -p $INST_ROOT YACS
 else
     check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT YACS
@@ -120,7 +113,7 @@ 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}/YACSWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}