@@ -60,31 +60,29 @@ build: off
62 - choco install wixtoolset %CHOCO_OPTS%
62 - choco install wixtoolset %CHOCO_OPTS%
64− if ($env:BUILD_TYPE -Match "stack") {
63+ - if "%BUILD_TYPE%" == "stack" (
65− choco install haskell-stack $env:CHOCO_OPTS
64+ choco install haskell-stack %CHOCO_OPTS%
67− choco install ghc --version $env:GHC_VERSION $env:CHOCO_OPTS
66+ choco install ghc --version %GHC_VERSION% %CHOCO_OPTS%
70# before_test:
69# before_test:
72test_script:
71test_script:
73 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
72 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
74 # descriptor
73 # descriptor
76− if ($env:BUILD_TYPE -Match "stack") {
74+ - if "%BUILD_TYPE%" == "stack" (
77 stack --version
75 stack --version
78 stack path
76 stack path
79 echo "" | stack clean
77 echo "" | stack clean
80− echo "" | stack install --stack-yaml $env:STACK_YAML $env:STACK_BUILD_OPTS $env:STACK_FLAGS pandoc pandoc-citeproc
78+ echo "" | stack install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% %STACK_FLAGS% pandoc pandoc-citeproc
82 cabal --version
80 cabal --version
83 cabal update
81 cabal update
84− cabal new-build $env:CABAL_BUILD_OPTS . pandoc-citeproc
82+ cabal new-build %CABAL_BUILD_OPTS% . pandoc-citeproc
85 cp "`find dist-newstyle/ -type f -name pandoc`" .\windows\
83 cp "`find dist-newstyle/ -type f -name pandoc`" .\windows\
86 cp "`find dist-newstyle/ -type f -name pandoc-citeproc`" .\windows\
84 cp "`find dist-newstyle/ -type f -name pandoc-citeproc`" .\windows\
89after_test:
87after_test:
90 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
88 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)