diff --git a/src/miniforge/devcontainer-feature.json b/src/miniforge/devcontainer-feature.json index df00022..24d1511 100644 --- a/src/miniforge/devcontainer-feature.json +++ b/src/miniforge/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "Conda, Mamba (Miniforge)", "id": "miniforge", - "version": "2.0.1", + "version": "2.0.2", "description": "Installs Conda and Mamba package manager and Python3. conda-forge set as the default (and only) channel.", "documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/miniforge", "options": { diff --git a/src/miniforge/install.sh b/src/miniforge/install.sh index 3b32cc8..b10c23b 100755 --- a/src/miniforge/install.sh +++ b/src/miniforge/install.sh @@ -51,7 +51,7 @@ elif [ "${USERNAME}" = "none" ] || ! id -u "${USERNAME}" >/dev/null 2>&1; then fi apt_get_update() { - if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then + if [ ! -d /var/lib/apt/lists ] || [ -z "$(ls -A /var/lib/apt/lists 2>/dev/null)" ]; then echo "Running apt-get update..." apt-get update -y fi @@ -87,12 +87,26 @@ find_version_from_git_tags() { check_packages ca-certificates version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)" if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then - declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)" - else - set +e - declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")" - set -e + requested_version="" + if [ "${repository}" = "https://github.com/conda-forge/miniforge" ]; then + check_packages curl + github_api_headers=() + if [ -n "${GITHUB_TOKEN:-}" ]; then + # use GITHUB_TOKEN to raise rate limits + github_api_headers=(-H "Authorization: Bearer ${GITHUB_TOKEN}" -H "X-GitHub-Api-Version: 2022-11-28") + fi + set +e + requested_version="$(curl -fsSL "${github_api_headers[@]}" "https://api.github.com/repos/conda-forge/miniforge/releases/latest" | sed -nE 's/^[[:space:]]*"tag_name":[[:space:]]*"([^"]+)".*/\1/p')" + set -e + fi + # fallback to most recent git tag if rate limit exceeded; this may unfortunately include pre-releases + if [ -z "${requested_version}" ]; then + requested_version="$(echo "${version_list}" | head -n 1)" + fi fi + set +e + declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")" + set -e fi if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" >/dev/null 2>&1; then echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2