hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Ospald 2022-01-28 22:51:22 +01:00
commit 2ed047515e
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
scripts/bootstrap/bootstrap-haskell
View File

@ -281,18 +281,18 @@ download_ghcup() {
# we may overwrite this in adjust_bashrc # we may overwrite this in adjust_bashrc
cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file" cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
case ":\$PATH:" in case ":\$PATH:" in
*:"${GHCUP_BIN}":*) *:"${GHCUP_BIN}":*)
;; ;;
*) *)
export PATH="${GHCUP_BIN}:\$PATH" export PATH="${GHCUP_BIN}:\$PATH"
;; ;;
esac esac
case ":\$PATH:" in case ":\$PATH:" in
*:"\$HOME/.cabal/bin":*) *:"\$HOME/.cabal/bin":*)
;; ;;
*) *)
export PATH="\$HOME/.cabal/bin:\$PATH" export PATH="\$HOME/.cabal/bin:\$PATH"
;; ;;
esac esac
EOF EOF
@ -382,36 +382,36 @@ adjust_bashrc() {
1) 1)
cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file" cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
case ":\$PATH:" in case ":\$PATH:" in
*:"${GHCUP_BIN}":*) *:"${GHCUP_BIN}":*)
;; ;;
*) *)
export PATH="${GHCUP_BIN}:\$PATH" export PATH="${GHCUP_BIN}:\$PATH"
;; ;;
esac esac
case ":\$PATH:" in case ":\$PATH:" in
*:"\$HOME/.cabal/bin":*) *:"\$HOME/.cabal/bin":*)
;; ;;
*) *)
export PATH="\$HOME/.cabal/bin:\$PATH" export PATH="\$HOME/.cabal/bin:\$PATH"
;; ;;
esac esac
EOF EOF
;; ;;
2) 2)
cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file" cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
case ":\$PATH:" in case ":\$PATH:" in
*:"\$HOME/.cabal/bin":*) *:"\$HOME/.cabal/bin":*)
;; ;;
*) *)
export PATH="\$PATH:\$HOME/.cabal/bin" export PATH="\$PATH:\$HOME/.cabal/bin"
;; ;;
esac esac
case ":\$PATH:" in case ":\$PATH:" in
*:"${GHCUP_BIN}":*) *:"${GHCUP_BIN}":*)
;; ;;
*) *)
export PATH="\$PATH:${GHCUP_BIN}" export PATH="\$PATH:${GHCUP_BIN}"
;; ;;
esac esac
EOF EOF
;; ;;