From ce89f2ddd934493f8374c2fb7f2e85078b214da6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 16 Oct 2024 11:36:55 -0500 Subject: [PATCH] Use bash arrays Co-authored-by: Kyle Edwards --- ci-conda.Dockerfile | 6 +++--- citestwheel.Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 87b35b3..81bc59e 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -62,15 +62,15 @@ case "${LINUX_VER}" in "ubuntu"*) os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2) if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then - tzdata_pkgs="tzdata tzdata-legacy" + tzdata_pkgs=(tzdata tzdata-legacy) else - tzdata_pkgs="tzdata" + tzdata_pkgs=(tzdata) fi apt-get update apt-get upgrade -y apt-get install -y --no-install-recommends \ - ${tzdata_pkgs} + "${tzdata_pkgs[@]}" rm -rf "/var/lib/apt/lists/*" ;; "rockylinux"*) diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile index 220d436..becac73 100644 --- a/citestwheel.Dockerfile +++ b/citestwheel.Dockerfile @@ -40,9 +40,9 @@ case "${LINUX_VER}" in # On Ubuntu 24.04 and newer, we also need tzdata-legacy os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2) if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then - tzdata_pkgs="tzdata tzdata-legacy" + tzdata_pkgs=(tzdata tzdata-legacy) else - tzdata_pkgs="tzdata" + tzdata_pkgs=(tzdata) fi apt-get install -y --no-install-recommends \ @@ -51,7 +51,7 @@ case "${LINUX_VER}" in libbz2-dev libreadline-dev libsqlite3-dev wget \ curl llvm libncursesw5-dev xz-utils tk-dev unzip \ libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \ - ${tzdata_pkgs} + "${tzdata_pkgs[@]}" rm -rf /var/cache/apt/archives /var/lib/apt/lists/* ;; "rockylinux"*)