Skip to content

Commit 0f60769

Browse files
bbartelsbbartels
authored
Merge pull request #1 from bbartels/copilot/update-download-base-url-support
Add mirror/keyserver override support across feature installers (incl. dotnet feed wiring)
2 parents a1a0998 + 5459890 commit 0f60769

14 files changed

Lines changed: 193 additions & 109 deletions

File tree

‎src/docker-in-docker/install.sh‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
1717
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1818
INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
1919
INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"false"}"
20-
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
21-
MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
20+
MICROSOFT_PACKAGES_MIRROR="${MICROSOFT_PACKAGES_MIRROR:-https://packages.microsoft.com}"
21+
GITHUB_RELEASE_URL="${GITHUB_RELEASE_MIRROR:-https://github.com}"
22+
DOCKER_MIRROR="${DOCKER_MIRROR:-https://download.docker.com}"
23+
MICROSOFT_GPG_KEYS_URI="${MICROSOFT_PACKAGES_MIRROR}/keys/microsoft.asc"
24+
MICROSOFT_GPG_KEYS_ROLLING_URI="${MICROSOFT_PACKAGES_MIRROR}/keys/microsoft-rolling.asc"
2225
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
2326
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble"
2427
DISABLE_IP6_TABLES="${DISABLEIP6TABLES:-false}"
@@ -329,7 +332,7 @@ if [ "${USE_MOBY}" = "true" ]; then
329332
curl -sSL ${MICROSOFT_GPG_KEYS_URI}
330333
curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
331334
} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
332-
echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
335+
echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] ${MICROSOFT_PACKAGES_MIRROR}/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
333336
;;
334337
rhel)
335338
echo "(*) ${ID} detected - checking for Moby packages..."
@@ -353,7 +356,7 @@ if [ "${USE_MOBY}" = "true" ]; then
353356
cat > /etc/yum.repos.d/microsoft.repo << EOF
354357
[microsoft]
355358
name=Microsoft Repository
356-
baseurl=https://packages.microsoft.com/repos/microsoft-cbl-mariner-2.0-prod-base/
359+
baseurl=${MICROSOFT_PACKAGES_MIRROR}/repos/microsoft-cbl-mariner-2.0-prod-base/
357360
enabled=1
358361
gpgcheck=1
359362
gpgkey=file:///etc/pki/rpm-gpg/microsoft.gpg
@@ -381,17 +384,17 @@ else
381384
cli_package_name="docker-ce-cli"
382385
case ${ADJUSTED_ID} in
383386
debian)
384-
curl -fsSL https://download.docker.com/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg
385-
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
387+
curl -fsSL ${DOCKER_MIRROR}/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg
388+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] ${DOCKER_MIRROR}/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
386389
;;
387390
rhel)
388391
# Docker CE repository setup for RHEL-based systems
389392
setup_docker_ce_repo() {
390-
curl -fsSL https://download.docker.com/linux/centos/gpg > /etc/pki/rpm-gpg/docker-ce.gpg
393+
curl -fsSL ${DOCKER_MIRROR}/linux/centos/gpg > /etc/pki/rpm-gpg/docker-ce.gpg
391394
cat > /etc/yum.repos.d/docker-ce.repo << EOF
392395
[docker-ce-stable]
393396
name=Docker CE Stable
394-
baseurl=https://download.docker.com/linux/centos/9/\$basearch/stable
397+
baseurl=${DOCKER_MIRROR}/linux/centos/9/\$basearch/stable
395398
enabled=1
396399
gpgcheck=1
397400
gpgkey=file:///etc/pki/rpm-gpg/docker-ce.gpg
@@ -436,9 +439,9 @@ EOF
436439
*)
437440
# Standard RHEL/CentOS/Fedora approach
438441
if command -v dnf >/dev/null 2>&1; then
439-
dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
442+
dnf config-manager --add-repo ${DOCKER_MIRROR}/linux/centos/docker-ce.repo
440443
elif command -v yum-config-manager >/dev/null 2>&1; then
441-
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
444+
yum-config-manager --add-repo ${DOCKER_MIRROR}/linux/centos/docker-ce.repo
442445
else
443446
# Manual fallback
444447
setup_docker_ce_repo
@@ -608,7 +611,7 @@ else
608611
echo "(*) Downloading Docker CE packages manually..."
609612

610613
# Get the repository baseurl
611-
repo_baseurl="https://download.docker.com/linux/centos/9/x86_64/stable"
614+
repo_baseurl="${DOCKER_MIRROR}/linux/centos/9/x86_64/stable"
612615

613616
# Download packages directly
614617
cd /tmp/docker-ce-install
@@ -685,7 +688,7 @@ fallback_compose(){
685688
echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
686689
get_previous_version "${url}" "${repo_url}" compose_version
687690
echo -e "\nAttempting to install v${compose_version}"
688-
curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
691+
curl -fsSL "${GITHUB_RELEASE_URL}/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
689692
}
690693

691694
# If 'docker-compose' command is to be included
@@ -705,11 +708,11 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
705708

706709
if [ "${target_compose_arch}" = "x86_64" ]; then
707710
echo "(*) Installing docker compose v1..."
708-
curl -fsSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -o ${docker_compose_path}
711+
curl -fsSL "${GITHUB_RELEASE_URL}/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -o ${docker_compose_path}
709712
chmod +x ${docker_compose_path}
710713

711714
# Download the SHA256 checksum
712-
DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64.sha256" | awk '{print $1}')"
715+
DOCKER_COMPOSE_SHA256="$(curl -sSL "${GITHUB_RELEASE_URL}/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64.sha256" | awk '{print $1}')"
713716
echo "${DOCKER_COMPOSE_SHA256} ${docker_compose_path}" > docker-compose.sha256sum
714717
sha256sum -c docker-compose.sha256sum --ignore-missing
715718
elif [ "${VERSION_CODENAME}" = "bookworm" ]; then
@@ -727,15 +730,15 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
727730
docker_compose_url="https://github.com/docker/compose"
728731
find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
729732
echo "(*) Installing docker-compose ${compose_version}..."
730-
curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
733+
curl -fsSL "${GITHUB_RELEASE_URL}/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
731734
echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
732735
fallback_compose "$docker_compose_url"
733736
}
734737

735738
chmod +x ${docker_compose_path}
736739

737740
# Download the SHA256 checksum
738-
DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}.sha256" | awk '{print $1}')"
741+
DOCKER_COMPOSE_SHA256="$(curl -sSL "${GITHUB_RELEASE_URL}/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}.sha256" | awk '{print $1}')"
739742
echo "${DOCKER_COMPOSE_SHA256} ${docker_compose_path}" > docker-compose.sha256sum
740743
sha256sum -c docker-compose.sha256sum --ignore-missing
741744

@@ -751,7 +754,7 @@ fallback_compose-switch() {
751754
echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
752755
get_previous_version "$url" "$repo_url" compose_switch_version
753756
echo -e "\nAttempting to install v${compose_switch_version}"
754-
curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch
757+
curl -fsSL "${GITHUB_RELEASE_URL}/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch
755758
}
756759
# Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
757760
if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
@@ -776,7 +779,7 @@ if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /d
776779
arm64|aarch64) target_switch_arch=arm64 ;;
777780
*) target_switch_arch=${architecture} ;;
778781
esac
779-
curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch || fallback_compose-switch "$compose_switch_url"
782+
curl -fsSL "${GITHUB_RELEASE_URL}/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch || fallback_compose-switch "$compose_switch_url"
780783
chmod +x /usr/local/bin/compose-switch
781784
# TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
782785
# Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
@@ -811,7 +814,7 @@ fallback_buildx() {
811814
get_previous_version "$url" "$repo_url" buildx_version
812815
buildx_file_name="buildx-v${buildx_version}.linux-${target_buildx_arch}"
813816
echo -e "\nAttempting to install v${buildx_version}"
814-
wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}
817+
wget ${GITHUB_RELEASE_URL}/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}
815818
}
816819

817820
if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
@@ -830,7 +833,7 @@ if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
830833
buildx_file_name="buildx-v${buildx_version}.linux-${target_buildx_arch}"
831834

832835
cd /tmp
833-
wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || fallback_buildx "$docker_buildx_url"
836+
wget ${GITHUB_RELEASE_URL}/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || fallback_buildx "$docker_buildx_url"
834837

835838
docker_home="/usr/libexec/docker"
836839
cli_plugins_dir="${docker_home}/cli-plugins"

‎src/dotnet/scripts/dotnet-helpers.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Maintainer: The Dev Container spec maintainers
99
DOTNET_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
1010
DOTNET_INSTALL_SCRIPT="$DOTNET_SCRIPTS/vendor/dotnet-install.sh"
11-
DOTNET_RELEASES_INDEX_URL="https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json"
11+
DOTNET_RELEASES_INDEX_URL="${DOTNET_RELEASES_MIRROR:-https://builds.dotnet.microsoft.com/dotnet}/release-metadata/releases-index.json"
1212

1313
# Prints the latest active dotnet version from the releases index.
1414
# Usage: fetch_latest_version [<target>]
@@ -86,6 +86,9 @@ install_sdk() {
8686
fi
8787

8888
local cmd=("$DOTNET_INSTALL_SCRIPT" "--version" "$version" "--install-dir" "$DOTNET_ROOT")
89+
if [ -n "${DOTNET_RELEASES_MIRROR:-}" ]; then
90+
cmd+=("--azure-feed" "${DOTNET_RELEASES_MIRROR}")
91+
fi
8992
if [ -n "$channel" ]; then
9093
cmd+=("--channel" "$channel")
9194
fi
@@ -125,6 +128,9 @@ install_runtime() {
125128
fi
126129

127130
local cmd=("$DOTNET_INSTALL_SCRIPT" "--runtime" "$runtime" "--version" "$version" "--install-dir" "$DOTNET_ROOT" "--no-path")
131+
if [ -n "${DOTNET_RELEASES_MIRROR:-}" ]; then
132+
cmd+=("--azure-feed" "${DOTNET_RELEASES_MIRROR}")
133+
fi
128134
if [ -n "$channel" ]; then
129135
cmd+=("--channel" "$channel")
130136
fi
@@ -235,4 +241,4 @@ install_completions() {
235241
# Fish: drop into the standard vendor completions directory
236242
mkdir -p /usr/share/fish/vendor_completions.d
237243
"$DOTNET_ROOT/dotnet" completions script fish > /usr/share/fish/vendor_completions.d/dotnet.fish
238-
}
244+
}

‎src/github-cli/install.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
CLI_VERSION=${VERSION:-"latest"}
1111
INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
1212
EXTENSIONS=${EXTENSIONS:-""}
13+
GITHUB_RELEASE_URL="${GITHUB_RELEASE_MIRROR:-https://github.com}"
1314

1415
GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
1516

@@ -25,6 +26,11 @@ fi
2526

2627
# Get the list of GPG key servers that are reachable
2728
get_gpg_key_servers() {
29+
if [ -n "${GPG_KEYSERVER:-}" ]; then
30+
echo "keyserver ${GPG_KEYSERVER}"
31+
return
32+
fi
33+
2834
declare -A keyservers_curl_map=(
2935
["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
3036
["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
@@ -196,14 +202,14 @@ install_deb_using_github() {
196202

197203
mkdir -p /tmp/ghcli
198204
pushd /tmp/ghcli
199-
wget -q --show-progress --progress=dot:giga https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
205+
wget -q --show-progress --progress=dot:giga ${GITHUB_RELEASE_URL}/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
200206
exit_code=$?
201207
set -e
202208
if [ "$exit_code" != "0" ]; then
203209
# Handle situation where git tags are ahead of what was is available to actually download
204210
echo "(!) github-cli version ${CLI_VERSION} failed to download. Attempting to fall back one version to retry..."
205211
find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
206-
wget -q --show-progress --progress=dot:giga https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
212+
wget -q --show-progress --progress=dot:giga ${GITHUB_RELEASE_URL}/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
207213
fi
208214

209215
dpkg -i /tmp/ghcli/${cli_filename}

‎src/go/install.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
TARGET_GO_VERSION="${VERSION:-"latest"}"
1111
GOLANGCILINT_VERSION="${GOLANGCILINTVERSION:-"latest"}"
12+
GO_MIRROR="${GO_MIRROR:-https://golang.org/dl}"
13+
GO_TAG_SOURCE="${GO_TAG_SOURCE:-https://github.com/golang/go}"
1214

1315
TARGET_GOROOT="${TARGET_GOROOT:-"/usr/local/go"}"
1416
TARGET_GOPATH="${TARGET_GOPATH:-"/go"}"
@@ -220,7 +222,7 @@ if ! [ -f /usr/bin/find ]; then
220222
fi
221223

222224
# Get closest match for version number specified
223-
find_version_from_git_tags TARGET_GO_VERSION "https://go.googlesource.com/go" "tags/go" "." "true"
225+
find_version_from_git_tags TARGET_GO_VERSION "${GO_TAG_SOURCE}" "tags/go" "." "true"
224226

225227
architecture="$(uname -m)"
226228
case $architecture in
@@ -248,7 +250,7 @@ if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version 2>/dev/null)" != *
248250
gpg -q --import /tmp/tmp-gnupg/golang_key
249251
echo "Downloading Go ${TARGET_GO_VERSION}..."
250252
set +e
251-
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
253+
curl -fsSL -o /tmp/go.tar.gz "${GO_MIRROR}/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
252254
exit_code=$?
253255
set -e
254256
if [ "$exit_code" != "0" ]; then
@@ -263,7 +265,7 @@ if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version 2>/dev/null)" != *
263265
((minor=minor-1))
264266
TARGET_GO_VERSION="${major}.${minor}"
265267
# Look for latest version from previous minor release
266-
find_version_from_git_tags TARGET_GO_VERSION "https://go.googlesource.com/go" "tags/go" "." "true"
268+
find_version_from_git_tags TARGET_GO_VERSION "${GO_TAG_SOURCE}" "tags/go" "." "true"
267269
else
268270
((breakfix=breakfix-1))
269271
if [ "${breakfix}" = "0" ]; then
@@ -274,9 +276,9 @@ if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version 2>/dev/null)" != *
274276
fi
275277
set -e
276278
echo "Trying ${TARGET_GO_VERSION}..."
277-
curl -fsSL -o /tmp/go.tar.gz "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
279+
curl -fsSL -o /tmp/go.tar.gz "${GO_MIRROR}/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz"
278280
fi
279-
curl -fsSL -o /tmp/go.tar.gz.asc "https://golang.org/dl/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz.asc"
281+
curl -fsSL -o /tmp/go.tar.gz.asc "${GO_MIRROR}/go${TARGET_GO_VERSION}.linux-${architecture}.tar.gz.asc"
280282
gpg --verify /tmp/go.tar.gz.asc /tmp/go.tar.gz
281283
echo "Extracting Go ${TARGET_GO_VERSION}..."
282284
tar -xzf /tmp/go.tar.gz -C "${TARGET_GOROOT}" --strip-components=1

‎src/java/install.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ANT_VERSION="${ANTVERSION:-"latest"}"
1919
INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
2020
GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
2121
JDK_DISTRO="${JDKDISTRO:-"ms"}"
22+
ADOPTIUM_API_URL="${ADOPTIUM_MIRROR:-https://api.adoptium.net}"
2223

2324
export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
2425
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
@@ -204,7 +205,7 @@ find_version_list() {
204205
java_ver=$6
205206

206207
check_packages jq
207-
all_versions=$(curl -s https://api.adoptium.net/v3/info/available_releases)
208+
all_versions=$(curl -s "${ADOPTIUM_API_URL}/v3/info/available_releases")
208209
if [ "${ifLts}" = "true" ]; then
209210
major_version=$(echo "$all_versions" | jq -r '.most_recent_lts')
210211
elif [ "${java_ver}" = "latest" ]; then
@@ -324,6 +325,17 @@ if [ ! -d "${SDKMAN_DIR}" ]; then
324325
export SDKMAN_NATIVE_VERSION="false"
325326
fi
326327
curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
328+
if [ -n "${SDKMAN_SERVICE_MIRROR:-}" ] && [ -f "${SDKMAN_DIR}/etc/config" ]; then
329+
sdkman_config_tmp="$(mktemp)"
330+
awk -v api="${SDKMAN_SERVICE_MIRROR}" '
331+
BEGIN { updated=0 }
332+
/^sdkman_api=/ { print "sdkman_api=" api; updated=1; next }
333+
{ print }
334+
END { if (updated == 0) print "sdkman_api=" api }
335+
' "${SDKMAN_DIR}/etc/config" > "${sdkman_config_tmp}"
336+
cat "${sdkman_config_tmp}" > "${SDKMAN_DIR}/etc/config"
337+
rm -f "${sdkman_config_tmp}"
338+
fi
327339
# For RHEL 8 systems, also disable native CLI in config file and remove native binaries
328340
if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${MAJOR_VERSION_ID}" = "8" ]; then
329341
# Disable native CLI in config to prevent future usage

0 commit comments

Comments
 (0)