Skip to content

GitLab

Commit 1cf998e8 authored by Jeromy Johnson's avatar Jeromy Johnson Committed by GitHub
Browse files
Options

Merge pull request #3818 from ipfs/fix/dist_get/harder 

misc: fix dist_get failing without failing
parents 2cc5ce45 dd007b23
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
bin/dist_get
View file @ 1cf998e8
......@@ -44,7 +44,7 @@ download() {
fi
try_download "$dl_url" "$dl_output" "wget '$dl_url' -O '$dl_output'" && return
try_download "$dl_url" "$dl_output" "curl --silent '$dl_url' > '$dl_output'" && return
try_download "$dl_url" "$dl_output" "curl --silent '$dl_url' > '$dl_output'" && return
try_download "$dl_url" "$dl_output" "fetch '$dl_url' -o '$dl_output'" && return
try_download "$dl_url" "$dl_output" "http '$dl_url' > '$dl_output'" && return
......@@ -65,7 +65,8 @@ unarchive() {
tar.gz)
if have_binary tar; then
echo "==> using 'tar' to extract binary from archive"
cat "$ua_infile" | tar -O -z -x -f - "$ua_distname/$ua_distname" > "$ua_outfile"
< "$ua_infile" tar -Ozxf - "$ua_distname/$ua_distname" > "$ua_outfile" \
|| die "tar has failed"
else
die "no binary on system for extracting tar files"
fi
......@@ -73,7 +74,8 @@ unarchive() {
zip)
if have_binary unzip; then
echo "==> using 'unzip' to extract binary from archive"
unzip -p "$ua_infile" "$ua_distname/$ua_distname" > "$ua_outfile"
unzip -p "$ua_infile" "$ua_distname/$ua_distname" > "$ua_outfile" \
|| die "unzip has failed"
else
die "no installed method for extracting .zip archives"
fi
......@@ -82,7 +84,7 @@ unarchive() {
die "unrecognized archive type '$ua_archivetype'"
esac
chmod +x "$ua_outfile"
chmod +x "$ua_outfile" || die "chmod has failed"
}
get_go_vars() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment