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
5fd30b41
Verified
Commit
5fd30b41
authored
4 years ago
by
Julian Ospald
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/merge-requests/49'
parents
824d2149
bbe2e876
No related branches found
No related tags found
1 merge request
!49
bootstrap-haskell: XDG: set proper GHCUP_DIR & create it
Pipeline
#28043
passed
4 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
bootstrap-haskell
+3
-3
3 additions, 3 deletions
bootstrap-haskell
with
7 additions
and
3 deletions
CHANGELOG.md
+
4
−
0
View file @
5fd30b41
# Revision history for ghcup
## WIP
*
Fix to
`ghcup`
directory creation and placement for the XDG install mode.
## 0.1.12 -- 2020-11-21
*
Fix disappearing HLS symlinks wrt #91
...
...
This diff is collapsed.
Click to expand it.
bootstrap-haskell
+
3
−
3
View file @
5fd30b41
...
...
@@ -19,7 +19,7 @@
export
GHCUP_USE_XDG_DIRS
if
[
-n
"
${
GHCUP_USE_XDG_DIRS
}
"
]
;
then
GHCUP_DIR
=
${
XDG_DATA_HOME
:
=
$HOME
/.local
}
/ghcup
GHCUP_DIR
=
${
XDG_DATA_HOME
:
=
$HOME
/.local
/share
}
/ghcup
GHCUP_BIN
=
${
XDG_BIN_HOME
:
=
$HOME
/.local/bin
}
else
GHCUP_DIR
=
${
GHCUP_INSTALL_BASE_PREFIX
}
/.ghcup
...
...
@@ -34,8 +34,7 @@ die() {
exit
2
}
edo
()
{
edo
()
{
"
$@
"
||
die
"
\"
$*
\"
failed!"
}
...
...
@@ -125,6 +124,7 @@ download_ghcup() {
edo
chmod
+x
"
${
GHCUP_BIN
}
"
/ghcup
edo
mkdir
-p
"
${
GHCUP_DIR
}
"
cat
<<-
EOF
> "
${
GHCUP_DIR
}
"/env || die "Failed to create env file"
export PATH="
\$
HOME/.cabal/bin:
${
GHCUP_BIN
}
:
\$
PATH"
EOF
...
...
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