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

Improve error handling

Browse Source
This commit is contained in:
Julian Ospald 2018-09-29 23:12:13 +08:00
parent eb66e87593
commit e21a72a09a
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ghcup.sh
View File

@ -243,6 +243,8 @@ install_ghc() {
downloader_opts="--fail -O" downloader_opts="--fail -O"
inst_location=${INSTALL_BASE}/ghc/${myghcver} inst_location=${INSTALL_BASE}/ghc/${myghcver}
target_location=${INSTALL_BASE}/bin target_location=${INSTALL_BASE}/bin
download_url=$(get_download_url "${myghcver}")
download_tarball_name=$(basename "${download_url}")
[ -e "${target_location}" ] || mkdir "${target_location}" [ -e "${target_location}" ] || mkdir "${target_location}"
@ -260,9 +262,9 @@ install_ghc() {
( (
edo cd "${tmp_dir}" edo cd "${tmp_dir}"
echov "Downloading $(get_download_url "${myghcver}")" echov "Downloading ${download_url}"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
edo ${downloader} ${downloader_opts} "$(get_download_url "${myghcver}")" edo ${downloader} ${downloader_opts} "${download_url}"
edo tar -xf ghc-*-linux.tar.xz edo tar -xf ghc-*-linux.tar.xz
edo cd "ghc-${myghcver}" edo cd "ghc-${myghcver}"
@ -274,12 +276,12 @@ install_ghc() {
# clean up # clean up
edo cd .. edo cd ..
rm "${tmp_dir}"/ghc-*-linux.tar.xz [ -e "${tmp_dir}/${download_tarball_name}" ] && rm "${tmp_dir}/${download_tarball_name}"
rm -r "${tmp_dir}/ghc-${myghcver}" [ -e "${tmp_dir}/ghc-${myghcver}" ] && rm -r "${tmp_dir}/ghc-${myghcver}"
) || { ) || {
rm "${tmp_dir}"/ghc-*-linux.tar.xz [ -e "${tmp_dir}/${download_tarball_name}" ] && rm "${tmp_dir}/${download_tarball_name}"
rm -r "${tmp_dir}/ghc-${myghcver}" [ -e "${tmp_dir}/ghc-${myghcver}" ] && rm -r "${tmp_dir}/ghc-${myghcver}"
die "Failed to install, cleaning up ${tmp_dir}" die "Failed to install"
} }
for f in "${inst_location}"/bin/*-"${myghcver}" ; do for f in "${inst_location}"/bin/*-"${myghcver}" ; do
@ -294,7 +296,7 @@ install_ghc() {
printf_green "Done installing, run \"ghci-${myghcver}\" or set up your current GHC via: ${SCRIPT} set-ghc ${myghcver}" printf_green "Done installing, run \"ghci-${myghcver}\" or set up your current GHC via: ${SCRIPT} set-ghc ${myghcver}"
unset myghcver downloader downloader_opts inst_location target_location f unset myghcver downloader downloader_opts inst_location target_location f download_url download_tarball_name
} }