X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fstart_salome.sh;h=be007de80db8844d93e6cfa7884bf399cd6126b0;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=e56791a5c65b009ed078c252d1f4692aa81910a4;hpb=09308c5cfb95765401dcc74e85c0b30c4ac1f4f2;p=tools%2Finstall.git diff --git a/config_files/start_salome.sh b/config_files/start_salome.sh index e56791a..be007de 100755 --- 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 -# Copyright : 2002-2007 CEA +# Copyright : 2002-2008 CEA # # This script is the part of the SALOME installation procedure. # @@ -16,8 +16,8 @@ # Returns 0 in success and 1 if any error occurs. check_enabled() { - if [ -f ${INSTALL_ROOT}/env_products.sh ] ; then - source ${INSTALL_ROOT}/env_products.sh + if [ -f ${INST_ROOT}/env_products.sh ] ; then + source ${INST_ROOT}/env_products.sh fi if [ "${KERNEL_ROOT_DIR}" != "" ] && [ "${GUI_ROOT_DIR}" != "" ] && [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then @@ -30,8 +30,8 @@ check_enabled() # Returns 0 in success and 1 if any error occurs. execute() { - if [ -f ${INSTALL_ROOT}/env_products.sh ] ; then - source ${INSTALL_ROOT}/env_products.sh + if [ -f ${INST_ROOT}/env_products.sh ] ; then + source ${INST_ROOT}/env_products.sh fi if [ "${KERNEL_ROOT_DIR}" != "" ] && [ "${GUI_ROOT_DIR}" != "" ] && [ -f ${KERNEL_ROOT_DIR}/bin/salome/runSalome ] ; then @@ -50,7 +50,7 @@ execute() # $3 is the temporary directory path SCRIPT_DIR=`dirname $0` PROCEDURE=$1; -INSTALL_ROOT=$2; +INST_ROOT=$2; INSTALL_WORK=$3; # Run the procedure