diff --git a/conda_pkg/finesse_2.2/bld.bat b/conda_pkg/finesse_2.2/bld.bat index 268ac473b9ae24113027c01830538a84a47ba6fb..91fd8b70caf0d80fdd018d92d1cbe4c57eaf58e4 100644 --- a/conda_pkg/finesse_2.2/bld.bat +++ b/conda_pkg/finesse_2.2/bld.bat @@ -8,7 +8,7 @@ IF "%ARCH%"=="64" ( ) IF "%ARCH%"=="32" ( - c:\msys64\mingw32 /bin/bash ./finesse.sh --build-win32 + c:\msys32\mingw32 /bin/bash ./finesse.sh --build-win32 ) @ECHO OFF diff --git a/conda_pkg/finesse_2.2/build.sh b/conda_pkg/finesse_2.2/build.sh index 1ba605e551c8c80e371d6bc957ba6b9cb33c4a44..0e36b83ac93285e07b2865a7cd43e54a60298da9 100755 --- a/conda_pkg/finesse_2.2/build.sh +++ b/conda_pkg/finesse_2.2/build.sh @@ -5,11 +5,6 @@ unamestr=`uname` unamem=`uname -m` branch=`git rev-parse --abbrev-ref HEAD` -if [[ "$branch" != 'master' ]]; then - echo !! Trying to push non-master branch to Conda !! - exit 1 -fi - if [[ "$unamestr" == 'Linux' ]]; then if [[ "${ARCH}" == '32' ]]; then ./finesse.sh --build-linux32