From 127b92de838c0f27c27aad3237032d82d7fbd501 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 9 Oct 2014 13:32:20 +0200 Subject: InstallDeps: Fix wrong OPENCOLLADA settings in final messages in some cases. Reported by Jefferson Rausseo through mail, thanks. --- build_files/build_environment/install_deps.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 903fdc3865e..4ed039940fb 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -471,11 +471,12 @@ while true; do esac done -if $WITH_ALL; then +if [ $WITH_ALL == true -a $OPENCOLLADA_SKIP == false ]; then WITH_OPENCOLLADA=true fi + # This has to be done here, because user might force some versions... PYTHON_SOURCE=( "http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" ) NUMPY_SOURCE=( "http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" ) -- cgit v1.2.3