Skip to content

Commit 969ddd2

Browse files
committed
Fix GO_BUILD_MIRROR_URL not working (#446)
1 parent 7e7bdb7 commit 969ddd2

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

plugins/go-build/bin/go-build

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,9 @@ http() {
453453
local file="$3"
454454
[ -n "$url" ] || return 1
455455

456-
if [[ -z $GO_BUILD_MIRROR_URL ]] && [[ $IS_TEST != "true" ]]; then
456+
if [ -n "$GO_BUILD_MIRROR_URL" ] && [ -z "$IS_TEST" ]; then
457+
url="$GO_BUILD_MIRROR_URL/${url}"
458+
else
457459
url="https://go.dev/dl/${url}"
458460
fi
459461

@@ -502,18 +504,11 @@ http_get_wget() {
502504
fetch_tarball() {
503505
local package_name="$1"
504506
local package_url="$2"
505-
local mirror_url
506507
local checksum
507508

508509
if [ "$package_url" != "${package_url/\#/}" ]; then
509510
checksum="${package_url#*#}"
510511
package_url="${package_url%%#*}"
511-
512-
if [ -n "$GO_BUILD_MIRROR_URL" ]; then
513-
if [[ -z "$GO_BUILD_DEFAULT_MIRROR" || $package_url != */go.dev/* ]]; then
514-
mirror_url="${GO_BUILD_MIRROR_URL}/$checksum"
515-
fi
516-
fi
517512
fi
518513

519514
local tar_args="xzf"
@@ -538,9 +533,7 @@ fetch_tarball() {
538533
if ! reuse_existing_tarball "$package_filename" "$checksum"; then
539534
local tarball_filename=$(basename $package_url)
540535
echo "Downloading ${tarball_filename}..." >&2
541-
http head "$mirror_url" &&
542-
download_tarball "$mirror_url" "$package_filename" "$checksum" ||
543-
download_tarball "$package_url" "$package_filename" "$checksum"
536+
download_tarball "$package_url" "$package_filename" "$checksum"
544537
fi
545538

546539
{
@@ -638,25 +631,18 @@ fetch_git() {
638631
fetch_zip() {
639632
local package_name="$1"
640633
local package_url="$2"
641-
local mirror_url
642634
local checksum
643635

644636
if [ "$package_url" != "${package_url/\#/}" ]; then
645637
checksum="${package_url#*#}"
646638
package_url="${package_url%%#*}"
647-
648-
if [ -n "$GO_BUILD_MIRROR_URL" ]; then
649-
mirror_url="${GO_BUILD_MIRROR_URL}/$checksum"
650-
fi
651639
fi
652640

653641
local package_filename="${package_name}.zip"
654642

655643
if ! reuse_existing_tarball "$package_filename" "$checksum"; then
656644
echo "Downloading ${package_filename}..." >&2
657-
http head "$mirror_url" &&
658-
download_tarball "$mirror_url" "$package_filename" "$checksum" ||
659-
download_tarball "$package_url" "$package_filename" "$checksum"
645+
download_tarball "$package_url" "$package_filename" "$checksum"
660646
fi
661647

662648
{

0 commit comments

Comments
 (0)