From a532aef9356e8640ea6a553d2c18482b56979630 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 29 Jun 2018 11:31:37 +0200 Subject: [PATCH] Update before_script.msvc.sh updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces. --- CI/before_script.msvc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 15903c6ba..5ca1de133 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -419,12 +419,12 @@ fi BOOST_SDK="$(real_pwd)/Boost" CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'` # get the current working drive's root - if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then + if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then printf "Exists. " elif [ -z $SKIP_EXTRACT ]; then rm -rf Boost - "${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log" - mv "${CWD_DRIVE_ROOT}Boost_temp" ${BOOST_SDK} + "${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log" + mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}" fi