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

Move error handling into download() function 

This also makes the verbosity messages better.
This commit is contained in:
Julian Ospald 2018-10-17 17:04:39 +08:00
parent 976635b65f
commit 869f306e35
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghcup
View File

@ -565,12 +565,10 @@ get_ghc_location() {
# @USAGE: <url> # @USAGE: <url>
# @DESCRIPTION: # @DESCRIPTION:
# Downloads the given url as a file into the current directory. # Downloads the given url as a file into the current directory.
# @RETURN: status code from the downloader
download() { download() {
[ -z "$1" ] && die "Internal error: no argument given to download" [ -z "$1" ] && die "Internal error: no argument given to download"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
${DOWNLOADER} ${DOWNLOADER_OPTS} "$1" edo ${DOWNLOADER} ${DOWNLOADER_OPTS} "$1"
return $?
} }
# @FUNCTION: unpack # @FUNCTION: unpack
@ -641,7 +639,7 @@ install_ghc() {
( (
edo cd "${tmp_dir}" edo cd "${tmp_dir}"
edo download "${download_url}" download "${download_url}"
unpack "${download_tarball_name}" unpack "${download_tarball_name}"
edo cd "ghc-${myghcver}" edo cd "ghc-${myghcver}"
@ -755,7 +753,7 @@ self_update() {
( (
edo cd "$(mktemp -d)" edo cd "$(mktemp -d)"
edo download "${SCRIPT_UPDATE_URL}" download "${SCRIPT_UPDATE_URL}"
edo chmod +x ghcup edo chmod +x ghcup
edo mv -f ghcup "${target_location}"/ghcup edo mv -f ghcup "${target_location}"/ghcup
@ -884,7 +882,7 @@ install_cabal() {
( (
edo cd "$(mktemp -d)" edo cd "$(mktemp -d)"
edo download "https://downloads.haskell.org/~cabal/cabal-install-${mycabalver}/cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz" download "https://downloads.haskell.org/~cabal/cabal-install-${mycabalver}/cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz"
unpack "cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz" unpack "cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz"
edo mv -f cabal "${inst_location}"/cabal edo mv -f cabal "${inst_location}"/cabal
rm "cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz" rm "cabal-install-${mycabalver}-${myarch}-unknown-linux.tar.gz"
@ -940,7 +938,7 @@ compile_ghc() {
( (
edo cd "${tmp_dir}" edo cd "${tmp_dir}"
edo download "${download_url}" download "${download_url}"
edo tar -xf ghc-*-src.tar.xz edo tar -xf ghc-*-src.tar.xz
edo cd "ghc-${myghcver}" edo cd "ghc-${myghcver}"