From 655ae2a9bb733dd698a3dcd66b77f2d22d04acb5 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 18 Oct 2020 22:18:48 -0700
Subject: [PATCH] ;ci: tweak

---
 .github/workflows/linux.yml   | 4 ++--
 .github/workflows/mac.yml     | 4 ++--
 .github/workflows/windows.yml | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b4d84febd..fcbc1c4f0 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -159,8 +159,8 @@ jobs:
       run: |
         mkdir -p ~/.local/bin
         export PATH=~/.local/bin:$PATH
-        curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
-        # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
+        # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
+        if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
         $stack --version
       env:
         stack: ${{ matrix.plan.stack }}
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 6aa12ccca..b64020b8f 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -114,8 +114,8 @@ jobs:
       run: |
         mkdir -p ~/.local/bin
         export PATH=~/.local/bin:$PATH
-        curl -sL https://get.haskellstack.org/stable/osx-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
-        # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/osx-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
+        curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
+        # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
         $stack --version
 
     - name: Install GHC
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index fe00afcb6..d00b0e465 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -121,8 +121,9 @@ jobs:
       #if: steps.stack-programs-dir.outputs.cache-hit != 'true'
       # this step is needed to get stack.exe into PATH, for now
       run: |
-        curl -skL -o stack.zip http://get.haskellstack.org/stable/windows-x86_64
-        7z x stack.zip -oC:\Windows stack.exe
+        curl -sL https://get.haskellstack.org/stable/windows-x86_64 -o stack.zip
+        # 7z x stack.zip -oC:\Windows stack.exe
+        7z x stack.zip stack.exe
         which stack
         stack --version