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

avoid requiring xz on os x, improve reqs msg

Browse Source
This commit is contained in:
Gershom 2019-07-18 01:59:04 -04:00
parent 0a71d0ae61
commit d7d7c955d9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ghcup
View File

@ -1020,6 +1020,7 @@ download_to_stdout() {
unpack() { unpack() {
[ -z "$1" ] && die "Internal error: no argument given to unpack" [ -z "$1" ] && die "Internal error: no argument given to unpack"
mydistro=$(get_distro_alias "$(get_distro_name)")
filename=$1 filename=$1
file_ext=${filename##*.} file_ext=${filename##*.}
@ -1028,8 +1029,14 @@ unpack() {
# capability # capability
case "${file_ext}" in case "${file_ext}" in
xz) xz)
debug_message "xz -cd \"${filename}\" | tar -xf -" if test "$mydistro" = "darwin";
( xz -cd "${filename}" | tar -xf - ; ) || die "unpacking failed!" then
debug_message "tar -xzf \"${filename}\""
( tar -xzf "${filename}" ) || die "unpacking failed!"
else
debug_message "xz -cd \"${filename}\" | tar -xf -"
( xz -cd "${filename}" | tar -xf - ; ) || die "unpacking failed!"
fi
;; ;;
gz) gz)
debug_message "gzip -cd \"${filename}\" | tar -xf -" debug_message "gzip -cd \"${filename}\" | tar -xf -"
@ -1042,7 +1049,7 @@ unpack() {
die "Unknown file extension: \"${file_ext}\"" die "Unknown file extension: \"${file_ext}\""
esac esac
unset filename file_ext unset mydistro filename file_ext
} }
# @FUNCTION: ask_for_confirmation # @FUNCTION: ask_for_confirmation
@ -1998,8 +2005,13 @@ 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
} }