diff --git a/cmd/linux.go b/cmd/linux.go index 5117e5e18..87bf1d298 100644 --- a/cmd/linux.go +++ b/cmd/linux.go @@ -27,6 +27,9 @@ const ( Debian // Gentoo distribution Gentoo + // Zorin distribution + Zorin + ) // DistroInfo contains all the information relating to a linux distribution @@ -70,6 +73,8 @@ func GetLinuxDistroInfo() *DistroInfo { result.Distribution = Debian case "Gentoo": result.Distribution = Gentoo + case "Zorin": + result.Distribution = Zorin } case "Description": result.Description = value diff --git a/cmd/prerequisites.go b/cmd/prerequisites.go index 2ea579434..51ad778c1 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 Gentoo: diff --git a/cmd/system.go b/cmd/system.go index cb29708df..57bb104d8 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/version.go b/cmd/version.go index 251e72e5e..857698294 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v0.17.0" +const Version = "v0.17.1-pre" diff --git a/cmd/wails/0_setup.go b/cmd/wails/0_setup.go index a9c8c0041..155a2a156 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