From 0884e966fe033654eb1a2b1e7459312f4afbd17e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 14 May 2024 10:45:49 +0100 Subject: [PATCH] Improve glibc check to also check keytar Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_linux.yaml | 4 +++- scripts/glibc-check.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 844afb0..513c618 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -139,7 +139,9 @@ jobs: fi ./scripts/glibc-check.sh dist/linux-*unpacked/element-desktop* - ./scripts/glibc-check.sh dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/matrix-seshat/index.node + for filename in $FILES; do + ./scripts/glibc-check.sh $filename + done env: ARCH: ${{ steps.config.outputs.arch }} diff --git a/scripts/glibc-check.sh b/scripts/glibc-check.sh index 8f2e8e5..60e070f 100755 --- a/scripts/glibc-check.sh +++ b/scripts/glibc-check.sh @@ -36,7 +36,7 @@ vercomp() { IFS=" " -VERS=$(objdump -T "$BINARY" | grep GLIBC | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -u) +VERS=$(objdump -T "$BINARY" | grep GLIBC_ | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -u) for VER in $VERS; do vercomp "$VER" "$MAX_VER"