feat: set wails version in go.mod

135 add debian support

README.md

@@ -46,7 +46,7 @@ Make sure you have the xcode command line tools installed. This can be done by r
 
 ### Linux
 
-#### Ubuntu 18.04
+#### Ubuntu 18.04, Debian 9
 
 `sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
 

cmd/linux.go

@@ -3,9 +3,12 @@ package cmd
 import (
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"os"
-	"regexp"
+	"runtime"
 	"strings"
+
+	"github.com/pkg/browser"
 )
 
 // LinuxDistribution is of type int
@@ -20,6 +23,8 @@ const (
 	Arch
 	// RedHat linux distribution
 	RedHat
+	// Debian distribution
+	Debian
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -29,6 +34,7 @@ type DistroInfo struct {
 	Release       string
 	Codename      string
 	DistributorID string
+	DiscoveredBy  string
 }
 
 // GetLinuxDistroInfo returns information about the running linux distribution
@@ -43,7 +49,7 @@ func GetLinuxDistroInfo() *DistroInfo {
 		if err != nil {
 			return result
 		}
-
+		result.DiscoveredBy = "lsb"
 		for _, line := range strings.Split(stdout, "\n") {
 			if strings.Contains(line, ":") {
 				// Iterate lines a
@@ -58,6 +64,8 @@ func GetLinuxDistroInfo() *DistroInfo {
 						result.Distribution = Ubuntu
 					case "Arch", "ManjaroLinux":
 						result.Distribution = Arch
+					case "Debian":
+						result.Distribution = Debian
 					}
 				case "Description":
 					result.Description = value
@@ -65,21 +73,37 @@ func GetLinuxDistroInfo() *DistroInfo {
 					result.Release = value
 				case "Codename":
 					result.Codename = value
-
 				}
 			}
 		}
 		// check if /etc/os-release exists
 	} else if _, err := os.Stat("/etc/os-release"); !os.IsNotExist(err) {
+		// Default value
+		osName := "Unknown"
+		version := ""
 		// read /etc/os-release
 		osRelease, _ := ioutil.ReadFile("/etc/os-release")
-		// compile a regex to find NAME=distro
-		re := regexp.MustCompile(`^NAME=(.*)\n`)
-		// extract the distro name
-		osName := string(re.FindSubmatch(osRelease)[1])
-		// strip quotations
-		osName = strings.Trim(osName, "\"")
+		// Split into lines
+		lines := strings.Split(string(osRelease), "\n")
+		// Iterate lines
+		for _, line := range lines {
+			// Split each line by the equals char
+			splitLine := strings.SplitN(line, "=", 2)
+			// Check we have
+			if len(splitLine) != 2 {
+				continue
+			}
+			switch splitLine[0] {
+			case "NAME":
+				osName = strings.Trim(splitLine[1], "\"")
+			case "VERSION_ID":
+				version = strings.Trim(splitLine[1], "\"")
+			}
+
+		}
 		// Check distro name against list of distros
+		result.Release = version
+		result.DiscoveredBy = "os-release"
 		switch osName {
 		case "Fedora":
 			result.Distribution = RedHat
@@ -87,6 +111,11 @@ func GetLinuxDistroInfo() *DistroInfo {
 			result.Distribution = RedHat
 		case "Arch Linux":
 			result.Distribution = Arch
+		case "Debian GNU/Linux":
+			result.Distribution = Debian
+		default:
+			result.Distribution = Unknown
+			result.DistributorID = osName
 		}
 	}
 	return result
@@ -124,3 +153,45 @@ func RpmInstalled(packageName string) (bool, error) {
 	_, _, exitCode, _ := rpm.Run("--query", packageName)
 	return exitCode == 0, nil
 }
+
+// RequestSupportForDistribution promts the user to submit a request to support their
+// currently unsupported distribution
+func RequestSupportForDistribution(distroInfo *DistroInfo, libraryName string) error {
+	var logger = NewLogger()
+	defaultError := fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, libraryName)
+
+	logger.Yellow("Distribution '%s' is not currently supported, but we would love to!", distroInfo.DistributorID)
+	q := fmt.Sprintf("Would you like to submit a request to support distribution '%s'?", distroInfo.DistributorID)
+	result := Prompt(q, "yes")
+	if strings.ToLower(result) != "yes" {
+		return defaultError
+	}
+
+	title := fmt.Sprintf("Support Distribution '%s'", distroInfo.DistributorID)
+
+	var str strings.Builder
+
+	gomodule, exists := os.LookupEnv("GO111MODULE")
+	if !exists {
+		gomodule = "(Not Set)"
+	}
+
+	str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")
+	str.WriteString(fmt.Sprintf("| Wails Version | %s |\n", Version))
+	str.WriteString(fmt.Sprintf("| Go Version    | %s |\n", runtime.Version()))
+	str.WriteString(fmt.Sprintf("| Platform      | %s |\n", runtime.GOOS))
+	str.WriteString(fmt.Sprintf("| Arch          | %s |\n", runtime.GOARCH))
+	str.WriteString(fmt.Sprintf("| GO111MODULE   | %s |\n", gomodule))
+	str.WriteString(fmt.Sprintf("| Distribution ID   | %s |\n", distroInfo.DistributorID))
+	str.WriteString(fmt.Sprintf("| Distribution Version   | %s |\n", distroInfo.Release))
+	str.WriteString(fmt.Sprintf("| Discovered by   | %s |\n", distroInfo.DiscoveredBy))
+
+	body := fmt.Sprintf("**Description**\nDistribution '%s' is curently unsupported.\n\n**Further Information**\n\n%s\n\n*Please add any extra information here, EG: libraries that are needed to make the distribution work, or commands to install them*", distroInfo.DistributorID, str.String())
+	fullURL := "https://github.com/wailsapp/wails/issues/new?"
+	params := "title=" + title + "&body=" + body
+
+	fmt.Println("Opening browser to file request.")
+	browser.OpenURL(fullURL + url.PathEscape(params))
+	return nil
+
+}

cmd/prerequisites.go

@@ -49,11 +49,10 @@ func getRequiredProgramsLinux() *Prerequisites {
 	result := &Prerequisites{}
 	distroInfo := GetLinuxDistroInfo()
 	switch distroInfo.Distribution {
-	case Ubuntu:
+	case Ubuntu, Debian:
 		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"))
-
 	default:
 		result.Add(newPrerequisite("gcc", "Please install with your system package manager and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with your system package manager and try again"))

cmd/project.go

@@ -143,11 +143,13 @@ type ProjectOptions struct {
 	log              *Logger
 	templates        *TemplateHelper
 	selectedTemplate *TemplateDetails
+	WailsVersion     string
 }
 
 // Defaults sets the default project template
 func (po *ProjectOptions) Defaults() {
 	po.Template = "vuebasic"
+	po.WailsVersion = Version
 }
 
 // PromptForInputs asks the user to input project details

cmd/system.go

@@ -272,7 +272,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 		for _, library := range *requiredLibraries {
 			switch distroInfo.Distribution {
-			case Ubuntu:
+			case Ubuntu, Debian:
 				installed, err := DpkgInstalled(library.Name)
 				if err != nil {
 					return false, err
@@ -295,7 +295,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
 			case RedHat:
-
 				installed, err := RpmInstalled(library.Name)
 				if err != nil {
 					return false, err
@@ -307,7 +306,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
 			default:
-				return false, fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, library.Name)
+				return false, RequestSupportForDistribution(distroInfo, library.Name)
 			}
 		}
 	}

cmd/templates.go

@@ -160,6 +160,9 @@ func (t *TemplateHelper) InstallTemplate(projectPath string, projectOptions *Pro
 
 	templatePath := projectOptions.selectedTemplate.Path
 
+	// Save the version
+	projectOptions.WailsVersion = Version
+
 	templateJSONFilename := filepath.Join(templatePath, t.metadataFilename)
 
 	templateFiles := templateFilenames.Filter(func(filename string) bool {

cmd/templates/create-react-app/.jshint

@@ -0,0 +1,3 @@
+{ 
+  "esversion": 6 
+}

cmd/templates/create-react-app/frontend/package.json.template

@@ -19,7 +19,11 @@
     "extends": "react-app"
   },
   "browserslist": {
-    "production": [],
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
     "development": [
       "last 1 chrome version",
       "last 1 firefox version",

cmd/templates/create-react-app/frontend/src/components/HelloWorld.js

@@ -26,22 +26,8 @@ class HelloWorld extends React.Component {
     this.setState({ showModal: false });
   }
 
-
-  startAsync() {
-    this.setState({
-      loading: true
-    });
-
-    window.backend.basic().then(result =>
-      this.setState({
-        loading: false,
-        result
-      })
-    );
-  }
-
   render() {
-    const { loading, result } = this.state;
+    const { result } = this.state;
     return (
       <div className="App">
         <button onClick={this.handleOpenModal} type="button">

cmd/templates/create-react-app/go.mod.template

@@ -1 +1,5 @@
-module {{.BinaryName}}
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)

cmd/templates/vuebasic/.jshint

@@ -0,0 +1,3 @@
+{ 
+  "esversion": 6 
+}

cmd/templates/vuebasic/go.mod.template

@@ -1 +1,5 @@
-module {{.BinaryName}}
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)

cmd/templates/vuetify-basic/go.mod.template

@@ -1 +1,5 @@
-module {{.BinaryName}}
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.16.1-pre"
+const Version = "v0.16.3-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:
+			case cmd.Ubuntu, cmd.Debian:
 				installed, err := cmd.DpkgInstalled(library.Name)
 				if err != nil {
 					return false, err
@@ -108,7 +108,7 @@ func checkLibraries() (errors bool, err error) {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
 			default:
-				return false, fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, library.Name)
+				return false, cmd.RequestSupportForDistribution(distroInfo, library.Name)
 			}
 		}
 	}