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

This commit is contained in:
Julian Ospald 2019-06-24 21:45:35 +08:00
commit 9cf7a6bbbe
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28

10
ghcup
View File

@ -1093,7 +1093,7 @@ get_distro_alias() {
"Fedora"|"fedora")
distro_alias=fedora
;;
"CentOS Linux"|"CentOS"|"centos")
"CentOS Linux"|"CentOS"|"centos"|"Red Hat Enterprise Linux"*)
distro_alias=centos
;;
"Alpine Linux"|"Alpine")
@ -1102,9 +1102,9 @@ get_distro_alias() {
"Linux Mint"|"LinuxMint")
distro_alias=mint
;;
"Amazon Linux AMI")
distro_alias=amazonlinux
;;
"Amazon Linux AMI")
distro_alias=amazonlinux
;;
"AIX")
distro_alias=aix
;;
@ -1752,7 +1752,7 @@ compile_ghc() {
if [ -n "${build_config}" ] ; then
edo cat "${build_config}" > mk/build.mk
else
cat <<-EOF > mk/build.mk || die
cat <<-EOF > mk/build.mk || die
V=0
BUILD_MAN = NO
BUILD_SPHINX_HTML = NO