Skip to content
Snippets Groups Projects
Commit e8d962ac authored by Emily Pillmore's avatar Emily Pillmore :ocean:
Browse files

Add language fixes per issue #237

parent ac1e1450
No related branches found
No related tags found
1 merge request!177Add language fixes per issue #237
...@@ -60,9 +60,10 @@ getCommonRequirements pr tr = ...@@ -60,9 +60,10 @@ getCommonRequirements pr tr =
prettyRequirements :: Requirements -> T.Text prettyRequirements :: Requirements -> T.Text
prettyRequirements Requirements {..} = prettyRequirements Requirements {..} =
let d = if not . null $ _distroPKGs let d = if not . null $ _distroPKGs
then then "\n Please ensure the following distro packages "
"\n Please install the following distro packages: " <> "are installed before continuing (you can exit ghcup "
<> T.intercalate " " _distroPKGs <> "and return at any time): "
<> T.intercalate " " _distroPKGs
else "" else ""
n = if not . T.null $ _notes then "\n Note: " <> _notes else "" n = if not . T.null $ _notes then "\n Note: " <> _notes else ""
in "System requirements " <> d <> n in "System requirements " <> d <> n
...@@ -100,7 +100,7 @@ eghcup() { ...@@ -100,7 +100,7 @@ eghcup() {
_eghcup() { _eghcup() {
if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then if [ -n "${BOOTSTRAP_HASKELL_YAML}" ] ; then
args="-s ${BOOTSTRAP_HASKELL_YAML}" args="-s ${BOOTSTRAP_HASKELL_YAML}"
fi fi
if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then
"${GHCUP_BIN}/ghcup" ${args} "$@" "${GHCUP_BIN}/ghcup" ${args} "$@"
else else
...@@ -405,7 +405,7 @@ warn_path() { ...@@ -405,7 +405,7 @@ warn_path() {
echo echo
[ -n "$1" ] && warn "$1" [ -n "$1" ] && warn "$1"
yellow "In order to run ghc and cabal, you need to adjust your PATH variable." 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)." yellow "session as well as your shell configuration (e.g. ~/.bashrc)."
} }
...@@ -677,4 +677,3 @@ _done ...@@ -677,4 +677,3 @@ _done
) )
# vim: tabstop=4 shiftwidth=4 expandtab # vim: tabstop=4 shiftwidth=4 expandtab
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment