mirror of
https://github.com/rbenv/ruby-build.git
synced 2024-12-29 13:15:33 +01:00
Merge pull request #326 from quark-zju/keep-downloaded-tarball
Keep downloaded tarball sometimes
This commit is contained in:
commit
1fb955eead
1 changed files with 13 additions and 7 deletions
|
@ -188,12 +188,13 @@ verify_checksum() {
|
|||
http() {
|
||||
local method="$1"
|
||||
local url="$2"
|
||||
local file="$3"
|
||||
[ -n "$url" ] || return 1
|
||||
|
||||
if type curl &>/dev/null; then
|
||||
"http_${method}_curl" "$url"
|
||||
"http_${method}_curl" "$url" "$file"
|
||||
elif type wget &>/dev/null; then
|
||||
"http_${method}_wget" "$url"
|
||||
"http_${method}_wget" "$url" "$file"
|
||||
else
|
||||
echo "error: please install \`curl\` or \`wget\` and try again" >&2
|
||||
exit 1
|
||||
|
@ -205,7 +206,7 @@ http_head_curl() {
|
|||
}
|
||||
|
||||
http_get_curl() {
|
||||
curl -qsSLf "$1"
|
||||
curl -C - -o "${2:--}" -qsSLf "$1"
|
||||
}
|
||||
|
||||
http_head_wget() {
|
||||
|
@ -213,7 +214,7 @@ http_head_wget() {
|
|||
}
|
||||
|
||||
http_get_wget() {
|
||||
wget -nv -O- "$1"
|
||||
wget -nv -c -O "${2:--}" "$1"
|
||||
}
|
||||
|
||||
fetch_tarball() {
|
||||
|
@ -240,8 +241,13 @@ fetch_tarball() {
|
|||
download_tarball "$package_url" "$package_filename" "$checksum"
|
||||
}
|
||||
|
||||
{ tar xzvf "$package_filename"
|
||||
rm -f "$package_filename"
|
||||
{ if tar xzvf "$package_filename"; then
|
||||
if [ -z "$KEEP_BUILD_PATH" ]; then
|
||||
rm -f "$package_filename"
|
||||
else
|
||||
true
|
||||
fi
|
||||
fi
|
||||
} >&4 2>&1
|
||||
}
|
||||
|
||||
|
@ -266,7 +272,7 @@ download_tarball() {
|
|||
|
||||
echo "-> $package_url" >&2
|
||||
|
||||
{ http get "$package_url" > "$package_filename"
|
||||
{ http get "$package_url" "$package_filename"
|
||||
verify_checksum "$package_filename" "$checksum"
|
||||
} >&4 2>&1 || return 1
|
||||
|
||||
|
|
Loading…
Reference in a new issue