Skip to content
This repository was archived by the owner on Jul 8, 2024. It is now read-only.

Commit 256d81e

Browse files
committed
Fix OS detection
Name is "Debian GNU/Linux" and not "Debian". Wildcard match to make it more robust, same for Ubuntu.
1 parent c6ff875 commit 256d81e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ghcup

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -494,25 +494,25 @@ get_download_url() {
494494

495495
# TODO: awkward, restructure
496496
case "${mydistro},${mydistrover},${myarch},${myghcver}" in
497-
Debian,7,i386,8.2.2)
497+
Debian*,7,i386,8.2.2)
498498
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb${mydistrover}-linux.tar.xz"
499499
;;
500500
*,*,i386,*)
501501
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb8-linux.tar.xz"
502502
;;
503-
Debian,*,*,8.2.2)
503+
Debian*,*,*,8.2.2)
504504
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb8-linux.tar.xz"
505505
;;
506-
Debian,8,*,*)
506+
Debian*,8,*,*)
507507
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb8-linux.tar.xz"
508508
;;
509-
Debian,*,*,*)
509+
Debian*,*,*,*)
510510
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb9-linux.tar.xz"
511511
;;
512-
Ubuntu,*,*,8.2.2)
512+
Ubuntu*,*,*,8.2.2)
513513
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb8-linux.tar.xz"
514514
;;
515-
Ubuntu,*,*,*)
515+
Ubuntu*,*,*,*)
516516
printf "%s" "${GHC_DOWNLOAD_BASEURL}/${myghcver}/ghc-${myghcver}-${myarch}-deb9-linux.tar.xz"
517517
;;
518518
*,*,*,8.2.2)

0 commit comments

Comments
 (0)