From c8ea84fe48b6479d17056205b2e1a0095194dff3 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 3 Dec 2014 15:08:49 +0300
Subject: [PATCH] Issue 0022816: duplicated files Rename scripts, to avoid
 duplicated file names

---
 bin/CMakeLists.txt                      | 6 +++---
 bin/{runAppli.in => runHEXABLOCK.in}    | 5 ++++-
 bin/{myrunSalome.py => runHEXABLOCK.py} | 0
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename bin/{runAppli.in => runHEXABLOCK.in} (90%)
 rename bin/{myrunSalome.py => runHEXABLOCK.py} (100%)

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 4e27cf0..9950b51 100755
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -18,14 +18,14 @@
 #
 
 SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
-SALOME_CONFIGURE_FILE(runAppli.in runAppli INSTALL ${SALOME_INSTALL_BINS})
+SALOME_CONFIGURE_FILE(runHEXABLOCK.in runHEXABLOCK INSTALL ${SALOME_INSTALL_BINS})
 
 # ===============================================================
 # Files to be installed
 # ===============================================================
 
 SET(_bin_scripts
-  myrunSalome.py
+  runHEXABLOCK.py
 )
 
-SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
\ No newline at end of file
+SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
diff --git a/bin/runAppli.in b/bin/runHEXABLOCK.in
similarity index 90%
rename from bin/runAppli.in
rename to bin/runHEXABLOCK.in
index 080a320..68ed4c4 100755
--- a/bin/runAppli.in
+++ b/bin/runHEXABLOCK.in
@@ -21,6 +21,9 @@
 if [ -z "${KERNEL_ROOT_DIR}" ] ; then 
 export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
 fi
+if [ -z "${GEOM_ROOT_DIR}" ] ; then 
+export GEOM_ROOT_DIR=@GEOM_ROOT_DIR@
+fi
 if [ -z "${HEXABLOCK_ROOT_DIR}" ] ; then 
 export HEXABLOCK_ROOT_DIR=@CMAKE_INSTALL_PREFIX@
 fi
@@ -59,4 +62,4 @@ searchFreePort() {
 searchFreePort
 
 
-${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HEXA_ROOT_DIR/bin/salome/myrunSalome.py --modules=HEXA --killall
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HEXABLOCK_ROOT_DIR/bin/salome/runHEXABLOCK.py --modules=GEOM,HEXABLOCK --killall
diff --git a/bin/myrunSalome.py b/bin/runHEXABLOCK.py
similarity index 100%
rename from bin/myrunSalome.py
rename to bin/runHEXABLOCK.py
-- 
2.39.2