Merge remote-tracking branch 'origin/merge-requests/177'

This commit is contained in:
Julian Ospald 2021-09-17 22:14:33 +02:00
commit 6799e9616e
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
2 changed files with 6 additions and 6 deletions

View File

@ -60,8 +60,9 @@ getCommonRequirements pr tr =
prettyRequirements :: Requirements -> T.Text
prettyRequirements Requirements {..} =
let d = if not . null $ _distroPKGs
then
"\n Please install the following distro packages: "
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 ""

View File

@ -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