Skip to content

Commit

Permalink
Use bash arrays
Browse files Browse the repository at this point in the history
Co-authored-by: Kyle Edwards <[email protected]>
  • Loading branch information
bdice and KyleFromNVIDIA authored Oct 16, 2024
1 parent f7ceae3 commit ce89f2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ci-conda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"*)
Expand Down
6 changes: 3 additions & 3 deletions citestwheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"*)
Expand Down

0 comments on commit ce89f2d

Please sign in to comment.