From 89992d863689b4f1d6161dd43d955034bffd3977 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 3 Jul 2019 19:42:32 +1000 Subject: [PATCH] feat: attempt to support Zorin --- cmd/linux.go | 4 ++++ cmd/prerequisites.go | 4 ++-- cmd/system.go | 2 +- cmd/wails/0_setup.go | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/linux.go b/cmd/linux.go index c1528495..88c66338 100644 --- a/cmd/linux.go +++ b/cmd/linux.go @@ -25,6 +25,8 @@ const ( RedHat // Debian distribution Debian + // Zorin distribution + Zorin ) // DistroInfo contains all the information relating to a linux distribution @@ -66,6 +68,8 @@ func GetLinuxDistroInfo() *DistroInfo { result.Distribution = Arch case "Debian": result.Distribution = Debian + case "Zorin": + result.Distribution = Zorin } case "Description": result.Description = value diff --git a/cmd/prerequisites.go b/cmd/prerequisites.go index 0d1a5901..4538bd70 100644 --- a/cmd/prerequisites.go +++ b/cmd/prerequisites.go @@ -49,7 +49,7 @@ func getRequiredProgramsLinux() *Prerequisites { result := &Prerequisites{} distroInfo := GetLinuxDistroInfo() switch distroInfo.Distribution { - case Ubuntu, Debian: + case Ubuntu, Debian, Zorin: result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again")) result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again")) result.Add(newPrerequisite("npm", "Please install with `sudo snap install node --channel=12/stable --classic` and try again")) @@ -93,7 +93,7 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) { result := &Prerequisites{} distroInfo := GetLinuxDistroInfo() switch distroInfo.Distribution { - case Ubuntu: + case Ubuntu, Debian, Zorin: result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again")) result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again")) case Arch: diff --git a/cmd/system.go b/cmd/system.go index 86ce69d9..5f43bcd7 100644 --- a/cmd/system.go +++ b/cmd/system.go @@ -272,7 +272,7 @@ func CheckDependencies(logger *Logger) (bool, error) { distroInfo := GetLinuxDistroInfo() for _, library := range *requiredLibraries { switch distroInfo.Distribution { - case Ubuntu, Debian: + case Ubuntu, Zorin, Debian: installed, err := DpkgInstalled(library.Name) if err != nil { return false, err diff --git a/cmd/wails/0_setup.go b/cmd/wails/0_setup.go index a9c8c004..155a2a15 100644 --- a/cmd/wails/0_setup.go +++ b/cmd/wails/0_setup.go @@ -96,7 +96,7 @@ func checkLibraries() (errors bool, err error) { distroInfo := cmd.GetLinuxDistroInfo() for _, library := range *requiredLibraries { switch distroInfo.Distribution { - case cmd.Ubuntu, cmd.Debian: + case cmd.Ubuntu, cmd.Zorin, cmd.Debian: installed, err := cmd.DpkgInstalled(library.Name) if err != nil { return false, err