Make corrections according to the issue 0022816

diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index 08c8d8ed9dd616a271dee386536dcaf3bb6d670c..cf1d5f9e1eae7966a4be43d3033569e5862215e3 100755 (executable)
--- 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 0b5972c36e2fd75c35489417f01b8cb33719d1cc..9426bc1297d30afbe7e12579416379e306d1bc47 100755 (executable)
--- 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 66f3629c2bedc7cfaeae53360ac3a9679322efc9..c7fcded06065c863f2b9b757e16e4b9fc5aa2c5b 100755 (executable)
--- 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 4ce5e8734a1c1911b07f478422426203017e9c0a..b802e1531ceba53f8032e437a78bca3ea60a99d2 100755 (executable)
--- 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 fb9aceac65d92b39c0caedda72ef54a478cdde5a..a43d0e5474aa0a6ea26d928957882f9bca4d2973 100755 (executable)
--- 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 22942d15aa25fd1a0b2d065bc637f5b4e3b681ea..08282fa30e35eac9dd3dc6662560ae128f042246 100755 (executable)
--- 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