From 1e746ec2ced7a3e8a13874950da4eace6e7c8100 Mon Sep 17 00:00:00 2001
From: Michal Biesek <michalbiesek@gmail.com>
Date: Mon, 7 Aug 2023 17:18:11 +0200
Subject: [PATCH] build-aux: simplify release.sh script

Signed-off-by: Michal Biesek <michalbiesek@gmail.com>
---
 build-aux/release.sh | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/build-aux/release.sh b/build-aux/release.sh
index 60563d0418..65c56b80f8 100755
--- a/build-aux/release.sh
+++ b/build-aux/release.sh
@@ -57,41 +57,19 @@ cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-amd64-disable-systemd
 
 rm -rf result
 
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-arm64.nix
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-arm64
-
-rm -rf result
-
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-arm64.nix --arg enableSystemd false
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-arm64-disable-systemd
-
-rm -rf result
-
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-ppc64le.nix
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-ppc64le
-
-rm -rf result
-
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-ppc64le.nix --arg enableSystemd false
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-ppc64le-disable-systemd
-
-rm -rf result
+for ARCH in arm64 ppc64le riscv64; do
+    $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
+        nix $NIX_ARGS build --file nix/default-$ARCH.nix
+    cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-$ARCH
 
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-riscv64.nix
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-riscv64
+    rm -rf result
 
-rm -rf result
+    $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
+        nix $NIX_ARGS build --file nix/default-$ARCH.nix --arg enableSystemd false
+    cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-$ARCH-disable-systemd
 
-$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \
-    nix $NIX_ARGS build --file nix/default-riscv64.nix --arg enableSystemd false
-cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-riscv64-disable-systemd
-
-rm -rf result
+    rm -rf result
+done
 
 if test x$SKIP_GPG = x; then
     for i in $OUTDIR/*; do