Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 014bb04

Browse files
author
CI
committed
Automated update for script library changes
1 parent c694b3c commit 014bb04

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

containers/codespaces-linux/.devcontainer/library-scripts/go-debian.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,14 @@ if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
166166
echo "Downloading Go ${TARGET_GO_VERSION}..."
167167
set +e
168168
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
169+
exit_code=$?
169170
set -e
170-
if [ ! -s "/tmp/go.tar.gz" ] || [ "$?" != "0" ]; then
171+
if [ "$exit_code" != "0" ]; then
171172
echo "(!) Download failed."
172173
# Try one break fix version number less if we get a failure
173-
major="$(echo "${TARGET_GO_VERSION}" | grep -oE '^[0-9]+')"
174-
minor="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.\K[0-9]+')"
175-
breakfix="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null)"
174+
major="$(echo "${TARGET_GO_VERSION}" | grep -oE '^[0-9]+' || echo '')"
175+
minor="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
176+
breakfix="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
176177
if [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
177178
((minor=minor-1))
178179
TARGET_GO_VERSION="${major}.${minor}"
@@ -184,7 +185,6 @@ if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
184185
echo "Trying ${TARGET_GO_VERSION}..."
185186
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
186187
fi
187-
set -e
188188
curl -fsSL -o /tmp/go.tar.gz.asc "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz.asc"
189189
gpg --verify /tmp/go.tar.gz.asc /tmp/go.tar.gz
190190
echo "Extracting Go ${TARGET_GO_VERSION}..."

containers/go/.devcontainer/library-scripts/go-debian.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,14 @@ if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
166166
echo "Downloading Go ${TARGET_GO_VERSION}..."
167167
set +e
168168
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
169+
exit_code=$?
169170
set -e
170-
if [ ! -s "/tmp/go.tar.gz" ] || [ "$?" != "0" ]; then
171+
if [ "$exit_code" != "0" ]; then
171172
echo "(!) Download failed."
172173
# Try one break fix version number less if we get a failure
173-
major="$(echo "${TARGET_GO_VERSION}" | grep -oE '^[0-9]+')"
174-
minor="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.\K[0-9]+')"
175-
breakfix="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null)"
174+
major="$(echo "${TARGET_GO_VERSION}" | grep -oE '^[0-9]+' || echo '')"
175+
minor="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
176+
breakfix="$(echo "${TARGET_GO_VERSION}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
176177
if [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
177178
((minor=minor-1))
178179
TARGET_GO_VERSION="${major}.${minor}"
@@ -184,7 +185,6 @@ if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
184185
echo "Trying ${TARGET_GO_VERSION}..."
185186
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
186187
fi
187-
set -e
188188
curl -fsSL -o /tmp/go.tar.gz.asc "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz.asc"
189189
gpg --verify /tmp/go.tar.gz.asc /tmp/go.tar.gz
190190
echo "Extracting Go ${TARGET_GO_VERSION}..."

0 commit comments

Comments
 (0)