X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config_files%2FCALCULATOR.sh;h=e383046af7463007fe24a6feef8d9169f658be2b;hb=88a9d22d35adefd3a6173c77047f7a9e91a2da2f;hp=a104b220f76286774002aa7c69f210713c37dfb3;hpb=b2d3f84aba2f2de9373dd0d8966b80e233b12754;p=tools%2Finstall.git diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index a104b22..e383046 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="3.2.7" +VERSION="4.0.0" check_version(){ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then @@ -24,12 +24,9 @@ if [ -n "${CALCULATOR_ROOT_DIR}" ]; then fi fi elif [ -n "${CALCULATOR_SRC_DIR}" ]; then - if [ -f ${CALCULATOR_SRC_DIR}/configure.in.base ]; then - ver=`grep -E "^VERSION=" ${CALCULATOR_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` - if [ "$ver" = "${VERSION}" ]; then - return 0 - fi - fi + check_salome_src_version CALCULATOR_SRC_DIR $VERSION + if [ $? -eq 0 ] ; then return 0 ; fi + return 1 fi return 1 }