From 1e33e286fc7130711a3c8c299db806e97adba419 Mon Sep 17 00:00:00 2001 From: Austin Vazquez <55906459+austinvazquez@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:25:22 -0700 Subject: [PATCH] fix: write artifact basename to configuration in update dependencies (#347) Issue #, if available: Found in #346 *Description of changes:* This change updates update-rootfs.sh and update-deps.sh to write the artifact basename to the ARTIFACT configuration variable. *Testing done:* Locally tested in bash: ``` aarch64_deps="aarch64/lima-and-qemu.macos-aarch64.1719307443.tar.gz" echo "AARCH64_ARTIFACT=$(basename "${aarch64_deps}")" ``` - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Austin Vazquez --- bin/update-deps.sh | 4 ++-- bin/update-rootfs.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/update-deps.sh b/bin/update-deps.sh index 7b346a3..3ce76e8 100755 --- a/bin/update-deps.sh +++ b/bin/update-deps.sh @@ -50,10 +50,10 @@ truncate -s 0 "${BUNDLES_FILE}" echo "ARTIFACT_BASE_URL=${DEPENDENCY_CLOUDFRONT_URL}" echo "" echo "AARCH64_ARTIFACT_PATHING=${AARCH64}" - echo "AARCH64_ARTIFACT=${aarch64_deps}" + echo "AARCH64_ARTIFACT=$(basename "${aarch64_deps}")" echo "AARCH64_512_DIGEST=${aarch64_deps_shasum}" echo "" echo "X86_64_ARTIFACT_PATHING=${X86_64}" - echo "X86_64_ARTIFACT=${amd64_deps}" + echo "X86_64_ARTIFACT=$(basename "${amd64_deps}")" echo "X86_64_512_DIGEST=${amd64_deps_shasum}" } >> "${BUNDLES_FILE}" diff --git a/bin/update-rootfs.sh b/bin/update-rootfs.sh index 389441f..959fa65 100755 --- a/bin/update-rootfs.sh +++ b/bin/update-rootfs.sh @@ -45,6 +45,6 @@ truncate -s 0 "${ROOTFS_FILE}" echo "ARTIFACT_BASE_URL=${DEPENDENCY_CLOUDFRONT_URL}" echo "" echo "X86_64_ARTIFACT_PATHING=${PLATFORM}/${X86_64}" - echo "X86_64_ARTIFACT=${amd64_deps}" + echo "X86_64_ARTIFACT=$(basename "${amd64_deps}")" echo "X86_64_512_DIGEST=${amd64_deps_shasum}" } >> "${ROOTFS_FILE}"