From 048932bf5040db313f645d906b0fe4d171410c0b Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 1 Feb 2023 16:53:25 +0800 Subject: [PATCH] Fix _eghcup invocations --- scripts/bootstrap/bootstrap-haskell | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index 313d80e..cbc361d 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -797,7 +797,7 @@ edo mkdir -p "${GHCUP_BIN}" if command -V "ghcup" >/dev/null 2>&1 ; then if [ -z "${BOOTSTRAP_HASKELL_NO_UPGRADE}" ] ; then - _eghcup upgrade || download_ghcup + ( _eghcup upgrade ) || download_ghcup fi else download_ghcup @@ -844,17 +844,17 @@ fi case $ask_hls_answer in 1) - _eghcup --cache install hls || warn "HLS installation failed, continuing anyway" + (_eghcup --cache install hls) || warn "HLS installation failed, continuing anyway" ;; *) ;; esac case $ask_stack_answer in 1) - _eghcup --cache install stack || die "Stack installation failed" + (_eghcup --cache install stack) || die "Stack installation failed" ;; 2) - _eghcup --cache install stack || die "Stack installation failed" + (_eghcup --cache install stack) || die "Stack installation failed" edo mkdir -p "${STACK_ROOOT:-$HOME/.stack}"/hooks hook_exe="${STACK_ROOOT:-$HOME/.stack}"/hooks/ghc-install.sh hook_url="https://www.haskell.org/ghcup/sh/hooks/stack/ghc-install.sh"