From dd49292b681c08c40134764acf54fed3333c3eea Mon Sep 17 00:00:00 2001 From: Byron Date: Wed, 8 Jan 2020 23:38:05 +0200 Subject: [PATCH] Feat manjaro arm & deepin (#324) * feat: new distros: manjaroARM & Deepin --- cmd/linux.go | 8 ++++++++ cmd/linuxdb.yaml | 24 +++++++++++++++++++++--- cmd/system.go | 4 ++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/cmd/linux.go b/cmd/linux.go index b6a7d29fe..3cdbc633b 100644 --- a/cmd/linux.go +++ b/cmd/linux.go @@ -47,6 +47,10 @@ const ( ArcoLinux // Manjaro distribution Manjaro + // ManjaroARM distribution + ManjaroARM + // Deepin distribution + Deepin ) // DistroInfo contains all the information relating to a linux distribution @@ -134,6 +138,10 @@ func parseOsRelease(osRelease string) *DistroInfo { result.Distribution = ArcoLinux case "manjaro": result.Distribution = Manjaro + case "manjaro-arm": + result.Distribution = ManjaroARM + case "deepin": + result.Distribution = Deepin default: result.Distribution = Unknown } diff --git a/cmd/linuxdb.yaml b/cmd/linuxdb.yaml index c55f81b11..e93d18cef 100644 --- a/cmd/linuxdb.yaml +++ b/cmd/linuxdb.yaml @@ -82,6 +82,15 @@ distributions: gccversioncommand: *gccdumpfullversion programs: *debiandefaultprograms libraries: *debiandefaultlibraries + deepin: + id: deepin + releases: + default: + version: default + name: Deepin + gccversioncommand: *gccdumpfullversion + programs: *debiandefaultprograms + libraries: *debiandefaultlibraries void: id: void releases: @@ -158,6 +167,15 @@ distributions: help: Please install with `sudo pacman -S gtk3` and try again - name: webkit2gtk help: Please install with `sudo pacman -S webkit2gtk` and try again + arcolinux: + id: arcolinux + releases: + default: + version: default + name: ArcoLinux + gccversioncommand: *gccdumpversion + programs: *archdefaultprograms + libraries: *archdefaultlibraries manjaro: id: manjaro releases: @@ -167,12 +185,12 @@ distributions: gccversioncommand: *gccdumpversion programs: *archdefaultprograms libraries: *archdefaultlibraries - arcolinux: - id: arcolinux + manjaro-arm: + id: manjaro-arm releases: default: version: default - name: ArcoLinux + name: Manjaro-ARM gccversioncommand: *gccdumpversion programs: *archdefaultprograms libraries: *archdefaultlibraries diff --git a/cmd/system.go b/cmd/system.go index eae77ecdf..de5ab11a8 100644 --- a/cmd/system.go +++ b/cmd/system.go @@ -274,9 +274,9 @@ func CheckDependencies(logger *Logger) (bool, error) { distroInfo := GetLinuxDistroInfo() switch distroInfo.Distribution { - case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon: + case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin: libraryChecker = DpkgInstalled - case Arch, Manjaro, ArcoLinux: + case Arch, ArcoLinux, Manjaro, ManjaroARM: libraryChecker = PacmanInstalled case CentOS, Fedora: libraryChecker = RpmInstalled