Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
ghcup-hs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
ghcup-hs
Commits
e8d962ac
Commit
e8d962ac
authored
4 years ago
by
Emily Pillmore
Browse files
Options
Downloads
Patches
Plain Diff
Add language fixes per issue
#237
parent
ac1e1450
No related branches found
No related tags found
1 merge request
!177
Add language fixes per issue #237
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/GHCup/Requirements.hs
+4
-3
4 additions, 3 deletions
lib/GHCup/Requirements.hs
scripts/bootstrap/bootstrap-haskell
+2
-3
2 additions, 3 deletions
scripts/bootstrap/bootstrap-haskell
with
6 additions
and
6 deletions
lib/GHCup/Requirements.hs
+
4
−
3
View file @
e8d962ac
...
@@ -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
This diff is collapsed.
Click to expand it.
scripts/bootstrap/bootstrap-haskell
+
2
−
3
View file @
e8d962ac
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment