diff options
| author | Josh Spicer <joshspicer@github.com> | 2022-06-13 22:30:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 22:30:45 +0300 |
| commit | 3d29560211c74574d057a877e2d44604a2d63aab (patch) | |
| tree | d8d396d7bd543e4b97e2ad18259f42960694f69e | |
| parent | 60970fcba50050a14f5d9443fab8b9ae224d9956 (diff) | |
port changes from vscode-dev-containers for jammy compat (#44)
* package compat
* port git-lfs fix (https://github.com/microsoft/vscode-dev-containers/pull/1500)
| -rw-r--r-- | src/common/install.sh | 2 | ||||
| -rw-r--r-- | src/git-lfs/install.sh | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/common/install.sh b/src/common/install.sh index ab8adb0..0b824c5 100644 --- a/src/common/install.sh +++ b/src/common/install.sh @@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then libkrb5-3 \ libgssapi-krb5-2 \ libicu[0-9][0-9] \ - liblttng-ust0 \ + liblttng-ust[0-9] \ libstdc++6 \ zlib1g \ locales \ diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh index 0ba88c3..e5934fa 100644 --- a/src/git-lfs/install.sh +++ b/src/git-lfs/install.sh @@ -139,6 +139,7 @@ install_using_apt() { if ! (apt-get update && apt-get install -yq git-lfs${version_suffix}); then rm -f /etc/apt/sources.list.d/git-lfs.list + echo "Could not fetch git-lfs from apt" return 1 fi @@ -151,6 +152,7 @@ install_using_github() { cd /tmp/git-lfs find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs" git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz" + echo "Looking for release artfact: ${git_lfs_filename}" curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}" # Verify file curl -sSL -o "sha256sums.asc" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/sha256sums.asc" @@ -158,8 +160,20 @@ install_using_github() { gpg -q --decrypt "sha256sums.asc" > sha256sums sha256sum --ignore-missing -c "sha256sums" # Extract and install + echo "Validated release artifact integrity." + echo "Starting to extract..." tar xf "${git_lfs_filename}" -C . - ./install.sh + echo "Installing..." + if [ -f "./install.sh" ]; then + ./install.sh + else + # Starting around v3.2.0, the release + # artifact file structure changed slightly + enclosed_folder="git-lfs-${GIT_LFS_VERSION}" + cd ${enclosed_folder} + ./install.sh + cd ../ + fi rm -rf /tmp/git-lfs /tmp/tmp-gnupg } |