Merge remote-tracking branch 'origin/merge-requestes/129'

This commit is contained in:
Julian Ospald 2020-01-09 00:42:44 +01:00
commit dbf76bd8be
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28

8
ghcup
View File

@ -1548,6 +1548,10 @@ set_ghc() {
# shellcheck disable=SC2046 # shellcheck disable=SC2046
edo ln $(optionv "-v") -sf "haddock-ghc${target_suffix}" "${BIN_LOCATION}/haddock${target_suffix}" edo ln $(optionv "-v") -sf "haddock-ghc${target_suffix}" "${BIN_LOCATION}/haddock${target_suffix}"
fi 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" status_message "Done"
@ -1661,6 +1665,10 @@ rm_ghc() {
fi fi
done done
unset t known_tools 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 "Done."
warning_message "You may now want to set currently active GHC to a different version via:" warning_message "You may now want to set currently active GHC to a different version via:"