From 8602d2e5258d5aee5fb8b6fd8f4c9faa6f5c7a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Fri, 8 Aug 2025 16:49:02 +0200 Subject: [PATCH] Stop using fgrep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > fgrep: warning: fgrep is obsolescent; using grep -F Should not change behavior. Signed-off-by: Miloslav Trmač --- contrib/cirrus/runner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 2de0b2d6..64117eba 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -71,8 +71,8 @@ _run_setup() { # automation, but the sources are in different directories. It's # possible for a mismatch to happen, but should (hopefully) be unlikely. # Double-check to make sure. - if ! fgrep -qx "ID=$OS_RELEASE_ID" $mnt/etc/os-release || \ - ! fgrep -qx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; then + if ! grep -Fqx "ID=$OS_RELEASE_ID" $mnt/etc/os-release || \ + ! grep -Fqx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; then die "Somehow $SKOPEO_CIDEV_CONTAINER_FQIN is not based on $OS_REL_VER." fi msg "Copying test binaries from $SKOPEO_CIDEV_CONTAINER_FQIN /usr/local/bin/"