Skip to content

Commit 8940c59

Browse files
committed
Fix spurious 404s in "versions.sh"
Also, update "large HTML" returns to store less raw content so the script is easier to debug.
1 parent 4723077 commit 8940c59

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

versions.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ else
1212
fi
1313
versions=( "${versions[@]%/}" )
1414

15-
releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')"
16-
newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml)
15+
releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/' | grep -A 2 '<td>Ruby')" # very wide grep to cut down on "set -x" output when debugging (should match the one later)
16+
newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/' | grep 'Released</a>')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml)
1717
# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well
1818

1919
for version in "${versions[@]}"; do
@@ -39,14 +39,14 @@ for version in "${versions[@]}"; do
3939
{
4040
versionReleasePage="$(grep "<td>Ruby $tryVersion</td>" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "<td><a href=" { print $2; exit }')" \
4141
&& [ -n "$versionReleasePage" ] \
42-
&& shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \
42+
&& shaVal="$(curl -fsL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \
4343
&& shaVal="$(awk <<<"$shaVal" '$1 == "SHA256:" { print $2; exit }')" \
4444
&& [ -n "$shaVal" ]
4545
} \
4646
|| {
47-
versionReleasePage="$(echo "$newsPage" | grep -oE '<a href="[^"]+">Ruby '"$tryVersion"' Released</a>' | cut -d'"' -f2)" \
47+
versionReleasePage="$(grep -oE '<a href="[^"]+">Ruby '"$tryVersion"' Released</a>' <<<"$newsPage" | cut -d'"' -f2)" \
4848
&& [ -n "$versionReleasePage" ] \
49-
&& shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \
49+
&& shaVal="$(curl -fsL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \
5050
&& shaVal="$(awk <<<"$shaVal" '$1 == "SHA256:" { print $2; exit }')" \
5151
&& [ -n "$shaVal" ]
5252
} \

0 commit comments

Comments
 (0)