Commit 1fb955ee by Erik Michaels-Ober

Merge pull request #326 from quark-zju/keep-downloaded-tarball

Keep downloaded tarball sometimes
parents 386b3761 3d2f1a72
...@@ -188,12 +188,13 @@ verify_checksum() { ...@@ -188,12 +188,13 @@ verify_checksum() {
http() { http() {
local method="$1" local method="$1"
local url="$2" local url="$2"
local file="$3"
[ -n "$url" ] || return 1 [ -n "$url" ] || return 1
if type curl &>/dev/null; then if type curl &>/dev/null; then
"http_${method}_curl" "$url" "http_${method}_curl" "$url" "$file"
elif type wget &>/dev/null; then elif type wget &>/dev/null; then
"http_${method}_wget" "$url" "http_${method}_wget" "$url" "$file"
else else
echo "error: please install \`curl\` or \`wget\` and try again" >&2 echo "error: please install \`curl\` or \`wget\` and try again" >&2
exit 1 exit 1
...@@ -205,7 +206,7 @@ http_head_curl() { ...@@ -205,7 +206,7 @@ http_head_curl() {
} }
http_get_curl() { http_get_curl() {
curl -qsSLf "$1" curl -C - -o "${2:--}" -qsSLf "$1"
} }
http_head_wget() { http_head_wget() {
...@@ -213,7 +214,7 @@ http_head_wget() { ...@@ -213,7 +214,7 @@ http_head_wget() {
} }
http_get_wget() { http_get_wget() {
wget -nv -O- "$1" wget -nv -c -O "${2:--}" "$1"
} }
fetch_tarball() { fetch_tarball() {
...@@ -240,8 +241,13 @@ fetch_tarball() { ...@@ -240,8 +241,13 @@ fetch_tarball() {
download_tarball "$package_url" "$package_filename" "$checksum" download_tarball "$package_url" "$package_filename" "$checksum"
} }
{ tar xzvf "$package_filename" { if tar xzvf "$package_filename"; then
rm -f "$package_filename" if [ -z "$KEEP_BUILD_PATH" ]; then
rm -f "$package_filename"
else
true
fi
fi
} >&4 2>&1 } >&4 2>&1
} }
...@@ -266,7 +272,7 @@ download_tarball() { ...@@ -266,7 +272,7 @@ download_tarball() {
echo "-> $package_url" >&2 echo "-> $package_url" >&2
{ http get "$package_url" > "$package_filename" { http get "$package_url" "$package_filename"
verify_checksum "$package_filename" "$checksum" verify_checksum "$package_filename" "$checksum"
} >&4 2>&1 || return 1 } >&4 2>&1 || return 1
......
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