[commit: packages/directory] Mistuke-bump-win32-version-bounds, bgamari-patch-1, master: Fix AppVeyor (e09aaa6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/directory

On branches: Mistuke-bump-win32-version-bounds,bgamari-patch-1,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e09aaa635f4855cc4c58ee138563ec70d65b49ae/directory

>---------------------------------------------------------------

commit e09aaa635f4855cc4c58ee138563ec70d65b49ae
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Dec 3 12:53:22 2016 -0500

    Fix AppVeyor
    
    Seems that Stack is now distributed via tar.gz instead of zip.


>---------------------------------------------------------------

e09aaa635f4855cc4c58ee138563ec70d65b49ae
 appveyor.yml     | 2 --
 tools/testscript | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 17cba1e..18209a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,8 +18,6 @@ cache:
 - "%STACK_ROOT%"
 install:
 - set PATH=%CD%\_stack;C:\msys64\usr\bin;%PATH%
-  # might have to retry due to reliability issues with SourceForge
-- sh tools/retry -n 32 pacman -S --needed --noconfirm autoconf automake tar
 - sh tools/testscript prepare
 test_script:
 - sh tools/testscript build
diff --git a/tools/testscript b/tools/testscript
index 85799bd..71a3840 100755
--- a/tools/testscript
+++ b/tools/testscript
@@ -31,8 +31,8 @@ prepare() {
                     mv */stack .;;
                 MSYS*)
                     url=https://www.stackage.org/stack/windows-x86_64
-                    curl --retry 3 -fsLSo stack.zip "$url"
-                    7z x -aoa stack.zip stack.exe;;
+                    curl --retry 3 -fsLS "$url" | tar xzf -
+                    mv */stack.exe .;;
                 *)
                     printf >&2 "unknown uname: %s\n" "`uname`"
                     return 1;;