From f7e94c6b71caf2708129d569da5c77435fde59e1 Mon Sep 17 00:00:00 2001 From: Andrew Lytvynov Date: Tue, 30 Apr 2024 19:33:23 -0700 Subject: [PATCH] scripts/installer.sh: remove unnecessary escaping in grep Updates #11263 Signed-off-by: Andrew Lytvynov --- .github/workflows/installer.yml | 6 ++++-- scripts/installer.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index 32d82cd9f..42522ed6a 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -32,7 +32,6 @@ jobs: - "ubuntu:18.04" - "ubuntu:20.04" - "ubuntu:22.04" - - "ubuntu:22.10" - "ubuntu:23.04" - "elementary/docker:stable" - "elementary/docker:unstable" @@ -91,7 +90,10 @@ jobs: || contains(matrix.image, 'parrotsec') || contains(matrix.image, 'kalilinux') - name: checkout - uses: actions/checkout@v4 + # We cannot use v4, as it requires a newer glibc version than some of the + # tested images provide. See + # https://github.com/actions/checkout/issues/1487 + uses: actions/checkout@v3 - name: run installer run: scripts/installer.sh # Package installation can fail in docker because systemd is not running diff --git a/scripts/installer.sh b/scripts/installer.sh index f11e98242..6e905a25c 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -527,7 +527,7 @@ main() { ;; apk) set -x - if ! grep -Eq '^http.*\/community$' /etc/apk/repositories; then + if ! grep -Eq '^http.*/community$' /etc/apk/repositories; then if type setup-apkrepos >/dev/null; then $SUDO setup-apkrepos -c -1 else