From 3e2df2e111e8f6cbb48ca4cf2c4859d585e46beb Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 27 Nov 2020 20:14:43 +0200 Subject: [PATCH 1/3] bootstrap-haskell: create GHCUP_DIR --- bootstrap-haskell | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-haskell b/bootstrap-haskell index 9135335..4bc7c87 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -23,8 +23,7 @@ die() { exit 2 } -edo() -{ +edo() { "$@" || die "\"$*\" failed!" } @@ -114,6 +113,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 From 67f59f6895ad0e4bc3cf44fd2e8da8581d1f56f1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 28 Nov 2020 01:41:02 +0200 Subject: [PATCH 2/3] bootstrap-haskell: fx XDG GHCUP_DIR value --- bootstrap-haskell | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-haskell b/bootstrap-haskell index 4bc7c87..04d8b22 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -8,7 +8,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 From bbe2e876402c372ab37e6cbb8f4ba80ca769dc23 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 28 Nov 2020 12:34:58 +0200 Subject: [PATCH 3/3] CHANGELOG.md: add note about `ghcup` directory fix` --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6115293..add2926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 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