Salome HOME
projects
/
tools
/
install.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SALOME 6.5.0 preparation: homard 10.3 -> 10.4
[tools/install.git]
/
config_files
/
start_salome.sh
diff --git
a/config_files/start_salome.sh
b/config_files/start_salome.sh
index 884ca9af083201270feeba642f0f1944218042e7..be007de80db8844d93e6cfa7884bf399cd6126b0 100755
(executable)
--- a/
config_files/start_salome.sh
+++ b/
config_files/start_salome.sh
@@
-6,7
+6,7
@@
# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
# Project : SALOME
# Module : Installation Wizard
# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
# Project : SALOME
# Module : Installation Wizard
-# Copyright : 2002-200
7
CEA
+# Copyright : 2002-200
8
CEA
#
# This script is the part of the SALOME installation procedure.
#
#
# This script is the part of the SALOME installation procedure.
#
@@
-16,10
+16,11
@@
# Returns 0 in success and 1 if any error occurs.
check_enabled()
{
# Returns 0 in success and 1 if any error occurs.
check_enabled()
{
- if [ -f ${INST
ALL
_ROOT}/env_products.sh ] ; then
- source ${INST
ALL
_ROOT}/env_products.sh
+ if [ -f ${INST_ROOT}/env_products.sh ] ; then
+ source ${INST_ROOT}/env_products.sh
fi
fi
- if [ "${KERNEL_ROOT_DIR}" != "" ] && [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then
+ if [ "${KERNEL_ROOT_DIR}" != "" ] && [ "${GUI_ROOT_DIR}" != "" ] &&
+ [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then
return 0;
fi
return 1;
return 0;
fi
return 1;
@@
-29,10
+30,11
@@
check_enabled()
# Returns 0 in success and 1 if any error occurs.
execute()
{
# Returns 0 in success and 1 if any error occurs.
execute()
{
- if [ -f ${INST
ALL
_ROOT}/env_products.sh ] ; then
- source ${INST
ALL
_ROOT}/env_products.sh
+ if [ -f ${INST_ROOT}/env_products.sh ] ; then
+ source ${INST_ROOT}/env_products.sh
fi
fi
- if [ "${KERNEL_ROOT_DIR}" != "" ] && [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then
+ if [ "${KERNEL_ROOT_DIR}" != "" ] && [ "${GUI_ROOT_DIR}" != "" ] &&
+ [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then
runSalome >& /dev/null
if [ "$?" == "0" ] ; then
return 0;
runSalome >& /dev/null
if [ "$?" == "0" ] ; then
return 0;
@@
-48,7
+50,7
@@
execute()
# $3 is the temporary directory path
SCRIPT_DIR=`dirname $0`
PROCEDURE=$1;
# $3 is the temporary directory path
SCRIPT_DIR=`dirname $0`
PROCEDURE=$1;
-INST
ALL
_ROOT=$2;
+INST_ROOT=$2;
INSTALL_WORK=$3;
# Run the procedure
INSTALL_WORK=$3;
# Run the procedure