From d4fc1f55e6e466a292bc3de41184434a74c9f6c7 Mon Sep 17 00:00:00 2001
From: Ulrich Huber <ulrich@huberulrich.de>
Date: Wed, 12 Jun 2019 19:34:54 -0400
Subject: [PATCH] Use MinGW bash to execute build scripts

---
 azure-pipelines.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b43ba11d..9f7918e7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -87,9 +87,7 @@ stages:
       displayName: 'Install dependencies on Windows'
     - script: |
         set PATH=%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\bash -lc "ls -l %CD:~0,2%\msys64\mingw64\bin"
-        %CD:~0,2%\msys64\usr\bin\bash -lc "echo $PATH"
-        %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-portaudio.sh"
+        %CD:~0,2%\msys64\msys2_shell.cmd -mingw64 -lc "./build-portaudio.sh"
       workingDirectory: ./windows-setup
       env:
         MSYS2_ARCH: $(MSYS2_ARCH)
@@ -98,12 +96,12 @@ stages:
       displayName: 'Build Portaudio'
     - script: |
         set PATH=%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\bash -lc "mkdir build"
+        %CD:~0,2%\msys64\msys2_shell.cmd -mingw64 -lc "mkdir build"
       displayName: 'Create build directory'
     - script: |
         set PATH=%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\bash -lc "cmake ..""
-        %CD:~0,2%\msys64\usr\bin\bash -lc "make"
+        %CD:~0,2%\msys64\msys2_shell.cmd -mingw64 -lc "cmake ..""
+        %CD:~0,2%\msys64\msys2_shell.cmd -mingw64 -lc "make"
       workingDirectory: ./build
       env:
         MSYS2_ARCH: $(MSYS2_ARCH)
@@ -112,7 +110,7 @@ stages:
       displayName: 'Build Xournal++'
     - script: |
         set PATH=%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-setup.sh"
+        %CD:~0,2%\msys64\msys2_shell.cmd -mingw64 -lc "bash ./build-setup.sh"
       workingDirectory: ./windows-setup
       env:
         MSYS2_ARCH: $(MSYS2_ARCH)