From 2c583bcae9e333693b9bd8fc353bb0dcb2af71df Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Mon, 21 Feb 2022 16:39:25 +0100
Subject: [PATCH] Fix NoAdjustCabalConfig on windows
---
scripts/bootstrap/bootstrap-haskell | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell
index cf6f0b9d..aae90d14 100755
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -525,7 +525,7 @@ ask_cabal_config_init() {
esac
done
else
- return 1
+ return 0
fi
;;
esac
@@ -543,8 +543,8 @@ do_cabal_config_init() {
adjust_cabal_config
;;
0)
- echo "Make sure that your global cabal.config references the correct mingw64 paths (extra-prog-path, extra-include-dirs and extra-lib-dirs)."
- echo "And set the environment variable GHCUP_MSYS2 to the root path of your msys2 installation."
+ warn "Make sure that your global cabal.config references the correct mingw64 paths (extra-prog-path, extra-include-dirs and extra-lib-dirs)."
+ warn "And set the environment variable GHCUP_MSYS2 to the root path of your msys2 installation."
sleep 5
return ;;
*) ;;
--
GitLab