From 59f0f4ac4260d7e7bd4e901fdd8970caf960d9a5 Mon Sep 17 00:00:00 2001 From: Agustin Gomes Date: Sun, 6 Oct 2024 20:47:48 +0200 Subject: [PATCH] Fix script/linux on RHEL/Fedora (#18788) - Add missing `/etc/os-release` from a grep call - Remove typo `grep grep` from another. Co-authored-by: Peter Tripp --- script/linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/linux b/script/linux index 540bf063ec..c69cd5a842 100755 --- a/script/linux +++ b/script/linux @@ -89,7 +89,7 @@ if [[ -n $dnf ]] || [[ -n $yum ]]; then perl-File-Copy mold ) - elif grep grep -qP '^ID="(rhel|rocky|alma|centos|ol)' /etc/os-release; then + elif grep -qP '^ID="(rhel|rocky|alma|centos|ol)' /etc/os-release; then deps+=( perl-interpreter ) fi @@ -102,7 +102,7 @@ if [[ -n $dnf ]] || [[ -n $yum ]]; then fi # libxkbcommon-x11-devel is in a non-default repo on RHEL 8.x/9.x (except on AmazonLinux) - if grep -qP '^VERSION_ID="(8|9)' && grep -qP '^ID="(rhel|rocky|centos|alma|ol)' /etc/os-release; then + if grep -qP '^VERSION_ID="(8|9)' /etc/os-release && grep -qP '^ID="(rhel|rocky|centos|alma|ol)' /etc/os-release; then $maysudo dnf install -y 'dnf-command(config-manager)' if grep -qP '^PRETTY_NAME="(AlmaLinux 8|Rocky Linux 8)' /etc/os-release; then $maysudo dnf config-manager --set-enabled powertools