From 7cd78df1cdf6ef718d8f1cbfcc8d110ba817eee4 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 17 May 2020 20:17:00 +1000 Subject: [PATCH] Support ArchLabs --- README.md | 2 +- cmd/linux.go | 10 +++++++--- cmd/linuxdb.yaml | 9 +++++++++ cmd/system.go | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 290ed1bb8..0d3791716 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ _Ubuntu: 16.04, 18.04, 19.04_ _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_ -#### Arch Linux +#### Arch Linux / ArchLabs `sudo pacman -S webkit2gtk gtk3` diff --git a/cmd/linux.go b/cmd/linux.go index 448c3c2b6..42af81a08 100644 --- a/cmd/linux.go +++ b/cmd/linux.go @@ -53,10 +53,12 @@ const ( Deepin // Raspbian distribution Raspbian - // openSUSE Tumbleweed distribution + // Tumbleweed (OpenSUSE) distribution Tumbleweed - // openSUSE Leap distribution + // Leap (OpenSUSE) distribution Leap + // ArchLabs distribution + ArchLabs ) // DistroInfo contains all the information relating to a linux distribution @@ -114,13 +116,15 @@ func parseOsRelease(osRelease string) *DistroInfo { } // Check distro name against list of distros - switch osID { + switch strings.ToLower(osID) { case "fedora": result.Distribution = Fedora case "centos": result.Distribution = CentOS case "arch": result.Distribution = Arch + case "archlabs": + result.Distribution = ArchLabs case "debian": result.Distribution = Debian case "ubuntu": diff --git a/cmd/linuxdb.yaml b/cmd/linuxdb.yaml index 4d6904943..a46c85cfe 100644 --- a/cmd/linuxdb.yaml +++ b/cmd/linuxdb.yaml @@ -176,6 +176,15 @@ distributions: gccversioncommand: *gccdumpversion programs: *archdefaultprograms libraries: *archdefaultlibraries + archlabs: + id: archlabs + releases: + default: + version: default + name: ArchLabs + gccversioncommand: *gccdumpversion + programs: *archdefaultprograms + libraries: *archdefaultlibraries manjaro: id: manjaro releases: diff --git a/cmd/system.go b/cmd/system.go index fea6aaef6..d9fb3d8f9 100644 --- a/cmd/system.go +++ b/cmd/system.go @@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) { switch distroInfo.Distribution { case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian: libraryChecker = DpkgInstalled - case Arch, ArcoLinux, Manjaro, ManjaroARM: + case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM: libraryChecker = PacmanInstalled case CentOS, Fedora, Tumbleweed, Leap: libraryChecker = RpmInstalled