From fedc0bbef6bbec837529d0ab1af12d4d642e1c9a Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Wed, 9 Jun 2021 16:31:40 +0200
Subject: [PATCH] Debug

---
 .gitlab/before_script/windows/install_deps.sh | 5 ++---
 .gitlab/ghcup_env                             | 2 +-
 .gitlab/script/ghcup_version.sh               | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab/before_script/windows/install_deps.sh b/.gitlab/before_script/windows/install_deps.sh
index 3c22412..df06977 100644
--- a/.gitlab/before_script/windows/install_deps.sh
+++ b/.gitlab/before_script/windows/install_deps.sh
@@ -6,11 +6,10 @@ set -eux
 
 mkdir -p "${TMPDIR}" "${CABAL_DIR}"
 
-rm -rf /c/ghcup
-mkdir -p /c/ghcup
+mkdir -p "$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
 
 CI_PROJECT_DIR=$(pwd)
-curl -o ghcup.exe https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-5.exe
+curl -o ghcup.exe https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-9.exe
 chmod +x ghcup.exe
 
 ./ghcup.exe install ${GHC_VERSION}
diff --git a/.gitlab/ghcup_env b/.gitlab/ghcup_env
index 46d289e..0d99880 100644
--- a/.gitlab/ghcup_env
+++ b/.gitlab/ghcup_env
@@ -1,6 +1,6 @@
 if [ "${OS}" = "WINDOWS" ] ; then
 	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-	export PATH="/c/ghcup/bin:$CI_PROJECT_DIR/.local/bin:$PATH"
+	export PATH="$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin:$CI_PROJECT_DIR/.local/bin:$PATH"
 	export TMPDIR="$CI_PROJECT_DIR/tmp"
 else
 	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh
index 4274bed..a3d57b7 100755
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -106,7 +106,11 @@ else # test wget a bit
 fi
 [ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 eghcup set 8.10.3
+eghcup list
+which ghc
 eghcup set 8.10.3
+eghcup list
+which ghc
 [ "$(ghc --numeric-version)" = "8.10.3" ]
 eghcup set ${GHC_VERSION}
 [ "$(ghc --numeric-version)" = "${ghc_ver}" ]