From 64e686363328ccba656a892cfd2bc9273d58464b Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 3 Dec 2014 18:27:05 +0300 Subject: [PATCH] Make corrections according to the issue 0022816 --- config_files/ATOMSOLV.sh | 2 +- config_files/CALCULATOR.sh | 2 +- config_files/HELLO.sh | 2 +- config_files/HEXABLOCK.sh | 2 +- config_files/HOMARD.sh | 2 +- config_files/PYHELLO.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh index 08c8d8e..cf1d5f9 100755 --- a/config_files/ATOMSOLV.sh +++ b/config_files/ATOMSOLV.sh @@ -118,7 +118,7 @@ export ATOMSOLV_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export ATOMSOLV_ROOT_DIR=.*%export ATOMSOLV_ROOT_DIR=${ATOMSOLV_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export ATOMSOLV_ROOT_DIR=.*%export ATOMSOLV_ROOT_DIR=${ATOMSOLV_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runATOMSOLV # to generate environment scripts try_preinstalled diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index 0b5972c..9426bc1 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -118,7 +118,7 @@ export CALCULATOR_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCALCULATORConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCALCULATORTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export CALCULATOR_ROOT_DIR=.*%export CALCULATOR_ROOT_DIR=${CALCULATOR_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export CALCULATOR_ROOT_DIR=.*%export CALCULATOR_ROOT_DIR=${CALCULATOR_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runCALCULATOR # to generate environment scripts try_preinstalled diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index 66f3629..c7fcded 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -117,7 +117,7 @@ export HELLO_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHELLOConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHELLOTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HELLO_ROOT_DIR=.*%export HELLO_ROOT_DIR=${HELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HELLO_ROOT_DIR=.*%export HELLO_ROOT_DIR=${HELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runHELLO # to generate environment scripts try_preinstalled diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh index 4ce5e87..b802e15 100755 --- a/config_files/HEXABLOCK.sh +++ b/config_files/HEXABLOCK.sh @@ -117,7 +117,7 @@ export HEXABLOCK_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HEXABLOCK_ROOT_DIR=.*%export HEXABLOCK_ROOT_DIR=${HEXABLOCK_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export GEOM_ROOT_DIR=.*%export GEOM_ROOT_DIR=${GEOM_ROOT_DIR}%g;s%export HEXABLOCK_ROOT_DIR=.*%export HEXABLOCK_ROOT_DIR=${HEXABLOCK_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runHEXABLOCK # to generate environment scripts try_preinstalled diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh index fb9acea..a43d0e5 100755 --- a/config_files/HOMARD.sh +++ b/config_files/HOMARD.sh @@ -117,7 +117,7 @@ export HOMARD_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HOMARD_ROOT_DIR=.*%export HOMARD_ROOT_DIR=${HOMARD_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HOMARD_ROOT_DIR=.*%export HOMARD_ROOT_DIR=${HOMARD_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runHOMARD # to generate environment scripts try_preinstalled diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index 22942d1..08282fa 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -116,7 +116,7 @@ export PYHELLO_ROOT_DIR=${PRODUCT_DIR} test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR} modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOConfig.cmake modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOTargets-release.cmake -sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli +sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runPYHELLO # to generate environment scripts try_preinstalled -- 2.39.2