From e5947f3490df66267ceef55a65739f942afe5dcc Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 30 Aug 2021 11:18:11 +0200 Subject: [PATCH] Add BOOTSTRAP_HASKELL_MINIMAL wrt #222 --- bootstrap-haskell | 37 ++++++++++++++++++++++++++++--------- bootstrap-haskell.ps1 | 12 +++++++++--- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/bootstrap-haskell b/bootstrap-haskell index 0a89e66..2d51d9a 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -3,6 +3,7 @@ # Main settings: # * BOOTSTRAP_HASKELL_NONINTERACTIVE - any nonzero value for noninteractive installation # * BOOTSTRAP_HASKELL_NO_UPGRADE - any nonzero value to not trigger the upgrade +# * BOOTSTRAP_HASKELL_MINIMAL - any nonzero value to only install ghcup # * GHCUP_USE_XDG_DIRS - any nonzero value to respect The XDG Base Directory Specification # * BOOTSTRAP_HASKELL_VERBOSE - any nonzero value for more verbose installation # * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install @@ -591,10 +592,12 @@ ask_bashrc ask_bashrc_answer=$? ask_cabal_config_init ask_cabal_config_init_answer=$? -ask_hls -ask_hls_answer=$? -ask_stack -ask_stack_answer=$? +if [ -z "${BOOTSTRAP_HASKELL_MINIMAL}" ] ; then + ask_hls + ask_hls_answer=$? + ask_stack + ask_stack_answer=$? +fi edo mkdir -p "${GHCUP_BIN}" @@ -620,14 +623,30 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then read -r answer