chore: version bump

feat: test support for Fedora

CONTRIBUTORS.md

@@ -13,3 +13,4 @@ Wails is what it is because of the time and effort given by these great people.
 * [Mark Stenglein](https://github.com/ocelotsloth)
 * [admin_3.exe](https://github.com/bh90210)
 * [iceleo-com](https://github.com/iceleo-com)
+* [fallendusk](https://github.com/fallendusk)

cmd/linux.go

@@ -25,6 +25,10 @@ const (
 	RedHat
 	// Debian distribution
 	Debian
+	// Gentoo distribution
+	Gentoo
+	// Zorin distribution
+	Zorin
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -66,6 +70,12 @@ func GetLinuxDistroInfo() *DistroInfo {
 						result.Distribution = Arch
 					case "Debian":
 						result.Distribution = Debian
+					case "Gentoo":
+						result.Distribution = Gentoo
+					case "Zorin":
+						result.Distribution = Zorin
+					case "Fedora":
+						result.Distribution = RedHat
 					}
 				case "Description":
 					result.Description = value
@@ -113,6 +123,8 @@ func GetLinuxDistroInfo() *DistroInfo {
 			result.Distribution = Arch
 		case "Debian GNU/Linux":
 			result.Distribution = Debian
+		case "Gentoo/Linux":
+			result.Distribution = Gentoo
 		default:
 			result.Distribution = Unknown
 			result.DistributorID = osName
@@ -121,6 +133,17 @@ func GetLinuxDistroInfo() *DistroInfo {
 	return result
 }
 
+// EqueryInstalled uses equery to see if a package is installed
+func EqueryInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	equery := program.FindProgram("equery")
+	if equery == nil {
+		return false, fmt.Errorf("cannont check dependencies: equery not found")
+	}
+	_, _, exitCode, _ := equery.Run("l", packageName)
+	return exitCode == 0, nil
+}
+
 // DpkgInstalled uses dpkg to see if a package is installed
 func DpkgInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()

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,9 +93,12 @@ 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:
+		result.Add(newPrerequisite("gtk+:3", "Please install with `sudo emerge gtk+:3` and try again"))
+		result.Add(newPrerequisite("webkit-gtk", "Please install with `sudo emerge webkit-gtk` and try again"))
 	case Arch:
 		result.Add(newPrerequisite("gtk3", "Please install with `sudo pacman -S gtk3` and try again"))
 		result.Add(newPrerequisite("webkit2gtk", "Please install with `sudo pacman -S webkit2gtk` and try again"))

cmd/project.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"sort"
 	"strings"
 
 	"github.com/leaanthony/slicer"
@@ -184,7 +185,13 @@ func (po *ProjectOptions) PromptForInputs() error {
 		po.selectedTemplate = templateDetails[po.Template]
 	} else {
 
-		for _, templateDetail := range templateDetails {
+		keys := make([]string, 0)
+		for k := range templateDetails {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+		for _, k := range keys {
+			templateDetail := templateDetails[k]
 			templateList.Add(templateDetail)
 			options.Add(fmt.Sprintf("%s - %s", templateDetail.Metadata.Name, templateDetail.Metadata.ShortDescription))
 		}

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
@@ -305,6 +305,17 @@ func CheckDependencies(logger *Logger) (bool, error) {
 				} else {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
+			case Gentoo:
+				installed, err := EqueryInstalled(library.Name)
+				if err != nil {
+					return false, err
+				}
+				if !installed {
+					errors = true
+					logger.Error("Library '%s' not found. %s", library.Name, library.Help)
+				} else {
+					logger.Green("Library '%s' installed.", library.Name)
+				}
 			default:
 				return false, RequestSupportForDistribution(distroInfo, library.Name)
 			}

cmd/templates/angular-template/frontend/src/app/app.component.ts

@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = '{{.Name}}';
+  title = 'my-app';
 
   clickMessage = '';
 

cmd/templates/angular-template/frontend/src/index.html.template

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-<title>{{.Name}}</title>
+<title>my-app</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">

cmd/templates/angular-template/template.json

@@ -1,14 +1,14 @@
 {
   "name": "Angular",
   "version": "1.0.0",
-  "shortdescription": "Angular 8 template",
+  "shortdescription": "Angular 8 template (Requires node 10.8+)",
   "description": "Angular projects w/ @angular/cli - Note: in order to reach the cli use npx like this: npx ng",
   "dependencies": [
-   {
-     "bin": "npx",
-     "help": "This template requires 'npx'. Please install with 'npm install -g npx'"
-   }
- ],
+    {
+      "bin": "npx",
+      "help": "This template requires 'npx'. Please install with 'npm install -g npx'"
+    }
+  ],
   "install": "npm install",
   "build": "npx ng build --single-bundle true --output-hashing none --prod --bundle-styles false",
   "author": "bh90210 <ktc@pm.me>",
@@ -17,4 +17,4 @@
   "serve": "npx ng serve --poll=2000",
   "bridge": "src",
   "wailsdir": ""
-}
+}

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.16.4-pre"
+const Version = "v0.17.2-pre"

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

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/leaanthony/mewn v0.10.7
-	github.com/leaanthony/slicer v1.3.1
+	github.com/leaanthony/slicer v1.3.2
 	github.com/leaanthony/spinner v0.5.3
 	github.com/masterminds/semver v1.4.2
 	github.com/mattn/go-colorable v0.1.1 // indirect

go.sum

@@ -33,8 +33,8 @@ github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA=
 github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
-github.com/leaanthony/slicer v1.3.1 h1:n2iIV2sxvL/3bpnmVY0vBjXf3yYFWcB6CYLVMrzJxRw=
-github.com/leaanthony/slicer v1.3.1/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
+github.com/leaanthony/slicer v1.3.2 h1:kGWWFoyaY5WzwGrUsHXMmGbssuYthP4qYBNlkNpNAB8=
+github.com/leaanthony/slicer v1.3.2/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
 github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=
 github.com/leaanthony/spinner v0.5.3/go.mod h1:oHlrvWicr++CVV7ALWYi+qHk/XNA91D9IJ48IqmpVUo=
 github.com/leaanthony/synx v0.1.0 h1:R0lmg2w6VMb8XcotOwAe5DLyzwjLrskNkwU7LLWsyL8=