Skip to content

Commit d5bbda7

Browse files
committed
Let RUBY_BUILD_MIRROR_PACKAGE_URL work even when there is no checksum
* And add RUBY_BUILD_IGNORE_CHECKSUM when it is expected the alternative URL has different contents.
1 parent 5478483 commit d5bbda7

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

bin/ruby-build

+10-6
Original file line numberDiff line numberDiff line change
@@ -365,14 +365,18 @@ fetch_tarball() {
365365
if [ "$package_url" != "${package_url/\#}" ]; then
366366
checksum="${package_url#*#}"
367367
package_url="${package_url%%#*}"
368+
fi
368369

369-
if [ -n "$RUBY_BUILD_MIRROR_URL" ]; then
370-
if [[ -z "$RUBY_BUILD_DEFAULT_MIRROR" || $package_url != */cache.ruby-lang.org/* ]]; then
371-
mirror_url="${RUBY_BUILD_MIRROR_URL}/$checksum"
372-
fi
373-
elif [ -n "$RUBY_BUILD_MIRROR_PACKAGE_URL" ]; then
374-
mirror_url="$RUBY_BUILD_MIRROR_PACKAGE_URL"
370+
if [[ -n "$RUBY_BUILD_MIRROR_URL" && -n "$checksum" ]]; then
371+
if [[ -z "$RUBY_BUILD_DEFAULT_MIRROR" || $package_url != */cache.ruby-lang.org/* ]]; then
372+
mirror_url="${RUBY_BUILD_MIRROR_URL}/$checksum"
375373
fi
374+
elif [ -n "$RUBY_BUILD_MIRROR_PACKAGE_URL" ]; then
375+
mirror_url="$RUBY_BUILD_MIRROR_PACKAGE_URL"
376+
fi
377+
378+
if [ -n "$RUBY_BUILD_IGNORE_CHECKSUM" ]; then
379+
checksum=""
376380
fi
377381

378382
local tar_args="xzf"

0 commit comments

Comments
 (0)