From ff7b6eacaf65a9fbca1d208f177689be4b357421 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 3 Apr 2021 16:15:32 +1100 Subject: [PATCH] Attempt to support RHEL --- cmd/linux.go | 4 ++++ cmd/linuxdb.yaml | 19 +++++++++++++++++++ cmd/system.go | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/cmd/linux.go b/cmd/linux.go index 4d55bc04..81dcd6fc 100644 --- a/cmd/linux.go +++ b/cmd/linux.go @@ -69,6 +69,8 @@ const ( EndeavourOS // Crux linux distribution Crux + // RHEL distribution + RHEL ) // DistroInfo contains all the information relating to a linux distribution @@ -131,6 +133,8 @@ func parseOsRelease(osRelease string) *DistroInfo { result.Distribution = Fedora case "centos": result.Distribution = CentOS + case "rhel": + result.Distribution = RHEL case "arch": result.Distribution = Arch case "archlabs": diff --git a/cmd/linuxdb.yaml b/cmd/linuxdb.yaml index 13920279..04db56c5 100644 --- a/cmd/linuxdb.yaml +++ b/cmd/linuxdb.yaml @@ -138,6 +138,25 @@ distributions: help: Please install with `sudo yum install gtk3-devel` and try again - name: webkitgtk3-devel help: Please install with `sudo yum install webkitgtk3-devel` and try again + rhel: + id: rhel + releases: + default: + version: default + name: Red Hat Enterprise Linux + gccversioncommand: *gccdumpversion + programs: + - name: gcc + help: Please install with `sudo yum install gcc-c++ make` and try again + - name: pkg-config + help: Please install with `sudo yum install pkgconf-pkg-config` and try again + - name: npm + help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again + libraries: + - name: gtk3-devel + help: Please install with `sudo yum install gtk3-devel` and try again + - name: webkitgtk3-devel + help: Please install with `sudo yum install webkitgtk3-devel` and try again fedora: id: fedora releases: diff --git a/cmd/system.go b/cmd/system.go index ddf8ffdb..76ab0b23 100644 --- a/cmd/system.go +++ b/cmd/system.go @@ -283,7 +283,7 @@ func CheckDependencies(logger *Logger) (bool, error) { libraryChecker = DpkgInstalled case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS: libraryChecker = PacmanInstalled - case CentOS, Fedora, Tumbleweed, Leap: + case CentOS, Fedora, Tumbleweed, Leap, RHEL: libraryChecker = RpmInstalled case Gentoo: libraryChecker = EqueryInstalled