From eba7cf7452b0aa2f8dff19d5fcc3b54d457c0f89 Mon Sep 17 00:00:00 2001 From: Diemo Gebhardt <me@diemogebhardt.com> Date: Sat, 30 Nov 2024 18:36:43 +0100 Subject: [PATCH] Test c2 --- bin/verify-binary-architecture.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/verify-binary-architecture.sh b/bin/verify-binary-architecture.sh index 80a92d146e8..a1662129003 100755 --- a/bin/verify-binary-architecture.sh +++ b/bin/verify-binary-architecture.sh @@ -8,13 +8,16 @@ fi TARGET_TRIPLE="$1" BINARY_PATH="$2" +# Architecture helper functions +parse() { grep -Eo 'x86_64|x86-64|arm64|aarch64|Aarch64' | head -n1; } +normalize() { sed -E 's/(x86-64|x86_64)/x86-64/;s/(arm64|Aarch64)/AArch64/'; } +unknown_architecture_for() { echo "unknown $1 architecture"; } + # Parse target architecture parse_target_architecture() { local target_triple="$1" get() { echo "$target_triple"; } - parse() { grep -Eo 'x86_64|aarch64'; } - fail() { echo "unknown target architecture"; } - get | parse || fail + get | parse | normalize || unknown_architecture_for "target" } TARGET_ARCHITECTURE=$(parse_target_architecture "$TARGET_TRIPLE") @@ -23,10 +26,7 @@ parse_and_normalize_binary_architecture() { local binary_path="$1" debug_pipe() { tee >(cat >&2); } get() { file -b "$binary_path" | debug_pipe; } - parse() { grep -Eo 'x86_64|x86-64|arm64|aarch64|Aarch64' | head -n1; } - normalize() { sed -E 's/x86-64/x86_64/;s/(arm64|Aarch64)/aarch64/'; } - fail() { echo "unknown binary architecture"; } - get | parse | normalize || fail + get | parse | normalize || unknown_architecture_for "binary" } BINARY_ARCHITECTURE=$(parse_and_normalize_binary_architecture "$BINARY_PATH") @@ -38,3 +38,4 @@ if [ "$BINARY_ARCHITECTURE" != "$TARGET_ARCHITECTURE" ]; then exit 1 fi echo "Architecture match for '$TARGET_TRIPLE'!" +exit 0