From e53616239da58d3104e06d0bd99ea0aca34cd951 Mon Sep 17 00:00:00 2001 From: Joshua Rich Date: Thu, 27 Jun 2024 11:17:38 +1000 Subject: [PATCH] fix: pass correct arch to apt-get --- build/scripts/install-build-deps | 10 +++++----- build/scripts/install-run-deps | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/scripts/install-build-deps b/build/scripts/install-build-deps index 900af260e..068099090 100755 --- a/build/scripts/install-build-deps +++ b/build/scripts/install-build-deps @@ -20,10 +20,10 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get -y install desktop-file-utils pkg-config git ${ccpkg[@]:0} -for arch in "$@"; do +for a in "${arch[@]}"; do apt-get -y install \ - libgl1-mesa-dev:${arch} xserver-xorg-dev:${arch} \ - libxcursor-dev:${arch} libxrandr-dev:${arch} \ - libxinerama-dev:${arch} libxi-dev:${arch} \ - libgl1-mesa-dev:${arch} libxxf86vm-dev:${arch} + libgl1-mesa-dev:${a} xserver-xorg-dev:${a} \ + libxcursor-dev:${a} libxrandr-dev:${a} \ + libxinerama-dev:${a} libxi-dev:${a} \ + libgl1-mesa-dev:${a} libxxf86vm-dev:${a} done diff --git a/build/scripts/install-run-deps b/build/scripts/install-run-deps index b1546ffaf..8979a160d 100755 --- a/build/scripts/install-run-deps +++ b/build/scripts/install-run-deps @@ -19,10 +19,10 @@ esac export DEBIAN_FRONTEND=noninteractive apt-get update -for arch in "$@"; do +for a in "${arch[@]}"; do apt-get -y install \ - libgl1:${arch} libx11-6:${arch} libglx0:${arch} \ - libglvnd0:${arch} libxcb1:${arch} libxau6:${arch} \ - libxdmcp6:${arch} dbus-x11:${arch} + libgl1:${a} libx11-6:${a} libglx0:${a} \ + libglvnd0:${a} libxcb1:${a} libxau6:${a} \ + libxdmcp6:${a} dbus-x11:${a} done rm -rf /var/lib/apt/lists/* /var/cache/apt/*