From e8d962ac44be99722135c9bcc7f14fbbfdbeeb87 Mon Sep 17 00:00:00 2001 From: Emily Pillmore Date: Fri, 17 Sep 2021 14:07:20 -0600 Subject: [PATCH] Add language fixes per issue #237 --- lib/GHCup/Requirements.hs | 7 ++++--- scripts/bootstrap/bootstrap-haskell | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/GHCup/Requirements.hs b/lib/GHCup/Requirements.hs index 31a9ab4..786dc3f 100644 --- a/lib/GHCup/Requirements.hs +++ b/lib/GHCup/Requirements.hs @@ -60,9 +60,10 @@ getCommonRequirements pr tr = prettyRequirements :: Requirements -> T.Text prettyRequirements Requirements {..} = let d = if not . null $ _distroPKGs - then - "\n Please install the following distro packages: " - <> T.intercalate " " _distroPKGs + then "\n Please ensure the following distro packages " + <> "are installed before continuing (you can exit ghcup " + <> "and return at any time): " + <> T.intercalate " " _distroPKGs else "" n = if not . T.null $ _notes then "\n Note: " <> _notes else "" in "System requirements " <> d <> n diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index 1d18be6..d08176a 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -100,7 +100,7 @@ eghcup() { _eghcup() { if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then args="-s ${BOOTSTRAP_HASKELL_YAML}" - fi + fi if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then "${GHCUP_BIN}/ghcup" ${args} "$@" else @@ -405,7 +405,7 @@ warn_path() { echo [ -n "$1" ] && warn "$1" yellow "In order to run ghc and cabal, you need to adjust your PATH variable." - yellow "To do so, you may want run 'source $GHCUP_DIR/env' in your current terminal" + yellow "To do so, you may want to run 'source $GHCUP_DIR/env' in your current terminal" yellow "session as well as your shell configuration (e.g. ~/.bashrc)." } @@ -677,4 +677,3 @@ _done ) # vim: tabstop=4 shiftwidth=4 expandtab -