hasufell/ghcup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code review

Browse Source
This commit is contained in:
Gershom 2019-07-22 02:23:02 -04:00
parent d7d7c955d9
commit be1300b08a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghcup
View File

@ -1029,8 +1029,7 @@ unpack() {
# capability # capability
case "${file_ext}" in case "${file_ext}" in
xz) xz)
if test "$mydistro" = "darwin"; if test "${mydistro}" = "darwin"; then
then
debug_message "tar -xzf \"${filename}\"" debug_message "tar -xzf \"${filename}\""
( tar -xzf "${filename}" ) || die "unpacking failed!" ( tar -xzf "${filename}" ) || die "unpacking failed!"
else else
@ -1991,6 +1990,9 @@ system_reqs_url() {
"debian"|"ubuntu") "debian"|"ubuntu")
printf "%s/.requirements/ghc/ubuntu" "${BASE_DOWNLOAD_URL}" printf "%s/.requirements/ghc/ubuntu" "${BASE_DOWNLOAD_URL}"
;; ;;
"darwin")
printf "%s/.requirements/ghc/darwin" "${BASE_DOWNLOAD_URL}"
;;
*) *)
printf "%s/.requirements/ghc/default" "${BASE_DOWNLOAD_URL}" printf "%s/.requirements/ghc/default" "${BASE_DOWNLOAD_URL}"
;; ;;
@ -2005,13 +2007,8 @@ print_system_reqs() {
mydistro=$(get_distro_alias "$(get_distro_name)") mydistro=$(get_distro_alias "$(get_distro_name)")
reqs_url=$(system_reqs_url "${mydistro}") reqs_url=$(system_reqs_url "${mydistro}")
download_to_stdout "${reqs_url}" download_to_stdout "${reqs_url}"
if test "$mydistro" = "darwin"; then
printf "%s\n" "(Note: on OS X, in the course of running ghcup you will be given a dialog box to install the command line tools. Accept and the requirements will be installed for you. You will then need to run the command again.)"
fi
unset mydistro reqs_url unset mydistro reqs_url
} }