mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-11 04:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix script/linux on RHEL/Fedora (#18788)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details
Docs / Check formatting (push) Waiting to run
Details

Browse source 
- Add missing `/etc/os-release` from a grep call
- Remove typo `grep grep` from another.

Co-authored-by: Peter Tripp <peter@zed.dev>
This commit is contained in:
Agustin Gomes 2024-10-06 20:47:48 +02:00 committed by GitHub
parent bd746145b0
commit 59f0f4ac42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/linux
View file

@ -89,7 +89,7 @@ if [[ -n $dnf ]] || [[ -n $yum ]]; then
perl-File-Copy perl-File-Copy
mold 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 ) deps+=( perl-interpreter )
fi fi
@ -102,7 +102,7 @@ if [[ -n $dnf ]] || [[ -n $yum ]]; then
fi fi
# libxkbcommon-x11-devel is in a non-default repo on RHEL 8.x/9.x (except on AmazonLinux) # 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)' $maysudo dnf install -y 'dnf-command(config-manager)'
if grep -qP '^PRETTY_NAME="(AlmaLinux 8|Rocky Linux 8)' /etc/os-release; then if grep -qP '^PRETTY_NAME="(AlmaLinux 8|Rocky Linux 8)' /etc/os-release; then
$maysudo dnf config-manager --set-enabled powertools $maysudo dnf config-manager --set-enabled powertools