Revert "Merge remote-tracking branch 'origin/merge-requestes/129'"
This reverts commitdbf76bd8be
, reversing changes made to64e3af0225
.
This commit is contained in:
parent
b322c27b48
commit
499914a8ea
8
ghcup
8
ghcup
@ -1548,10 +1548,6 @@ 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"
|
||||||
|
|
||||||
@ -1665,10 +1661,6 @@ 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:"
|
||||||
|
Loading…
Reference in New Issue
Block a user