From 00119a818b72bf45de708905934d565392930ef3 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 9 Jan 2020 16:37:42 +0100 Subject: [PATCH] Reinstate "Merge remote-tracking branch 'origin/merge-requestes/129'" --- ghcup | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ghcup b/ghcup index 94bfc81..c76bfe2 100755 --- a/ghcup +++ b/ghcup @@ -1548,6 +1548,10 @@ set_ghc() { # shellcheck disable=SC2046 edo ln $(optionv "-v") -sf "haddock-ghc${target_suffix}" "${BIN_LOCATION}/haddock${target_suffix}" fi + if [ -z "${target_suffix}" ] && [ -d "${inst_location}/share" ] ; then + # shellcheck disable=SC2046 + edo ln $(optionv "-v") -sfT ghc/"${myghcver}"/share "${BIN_LOCATION}/../share" + fi status_message "Done" @@ -1661,6 +1665,10 @@ rm_ghc() { fi done unset t known_tools + # remove dangling symlink to share directory + if [ -h "${BIN_LOCATION}/../share" ] && [ ! -e "${BIN_LOCATION}/../share" ] ; then + edo rm "${BIN_LOCATION}/../share" + fi warning_message "Done." warning_message "You may now want to set currently active GHC to a different version via:"