From 7e317984465c07ea1bba7ae1c37e598e91c59810 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 13 Jun 2021 14:43:00 +0200 Subject: [PATCH] Fix ghcup_version.sh --- .gitlab/script/ghcup_version.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh index c83c85d..0412e2a 100755 --- a/.gitlab/script/ghcup_version.sh +++ b/.gitlab/script/ghcup_version.sh @@ -60,8 +60,13 @@ else fi -cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" "$CI_PROJECT_DIR"/.local/bin/ghcup -cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" "$CI_PROJECT_DIR"/.local/bin/ghcup-gen +if [ "${OS}" = "WINDOWS" ] ; then + ext=".exe" +else + ext='' +fi + cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" "$CI_PROJECT_DIR"/.local/bin/ghcup${ext} + cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" "$CI_PROJECT_DIR"/.local/bin/ghcup-gen${ext} ### cleanup @@ -71,6 +76,7 @@ else rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup fi +which ghcup ### manual cli based testing