Support EndeavourOS

v1.10.0-pre1
542 use supplied html (#547 )
2026-04-03 21:52:45 -07:00 · 2020-11-26 20:43:22 +11:00 · 2020-11-01 06:32:42 +11:00 · 2020-11-01 06:31:35 +11:00 · 2020-10-31 16:24:35 +11:00 · 2020-10-31 16:23:23 +11:00
9 changed files with 84 additions and 37 deletions
--- a/cmd/cmd-mewn.go
+++ b/cmd/cmd-mewn.go
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,6 +65,8 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
+	// EndeavourOS linux distribution
+	EndeavourOS
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -132,7 +134,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
 	case "archlabs":
 		result.Distribution = ArchLabs
 	case "ctlos":
-		result.Distribution = Ctlos	
+		result.Distribution = Ctlos
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -171,6 +173,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
+	case "endeavouros":
+		result.Distribution = EndeavourOS
 	default:
 		result.Distribution = Unknown
 	}
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -202,7 +202,16 @@ distributions:
        name: Ctlos Linux
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries                
+        libraries: *archdefaultlibraries   
+  endeavouros:
+    id: endeavouros
+    releases:
+      default:
+        version: default
+        name: EndeavourOS
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries             
  manjaro:
    id: manjaro
    releases:
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.9.0"
+const Version = "v1.10.0-pre1"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -73,7 +73,6 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
-		projectOptions.UseFirebug = usefirebug

 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -83,6 +82,9 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}

+		// Set firebug flag
+		projectOptions.UseFirebug = usefirebug
+
 		// Check that this platform is supported
 		if !projectOptions.PlatformSupported() {
 			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))
--- a/config.go
+++ b/config.go
@@ -1,20 +1,39 @@
 package wails

 import (
-	b64 "encoding/base64"
+	"fmt"
+	"net/url"
+	"strings"

+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	Width, Height    int
-	Title            string
-	HTML             string
-	JS               string
-	CSS              string
-	Colour           string
-	Resizable        bool
+	// The width and height of your application in pixels
+	Width, Height int
+
+	// The title to put in the title bar
+	Title string
+
+	// The HTML your app should use. If you leave it blank, a default will be used:
+	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
+	HTML string
+
+	// The Javascript your app should use. Normally this should be generated by a bundler.
+	JS string
+
+	// The CSS your app should use. Normally this should be generated by a bundler.
+	CSS string
+
+	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
+	Colour string
+
+	// Indicates whether your app should be resizable
+	Resizable bool
+
+	// Indicated if the devtools should be disabled
 	DisableInspector bool
 }

@@ -33,9 +52,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetHTML returns the HTML for the app
+// GetHTML returns the default HTML
 func (a *AppConfig) GetHTML() string {
-	return "data:text/html;base64," + b64.URLEncoding.EncodeToString([]byte(a.HTML))
+	if len(a.HTML) > 0 {
+		a.HTML = url.QueryEscape(a.HTML)
+		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
+		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
+	}
+	return a.HTML
 }

 // GetResizable returns true if the window should be resizable
@@ -75,14 +99,14 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.Colour = in.Colour
 	}

-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.JS != "" {
 		a.JS = in.JS
 	}

+	if in.HTML != "" {
+		a.HTML = in.HTML
+	}
+
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -103,7 +127,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      defaultHTML,
+		HTML:      mewn.String("./runtime/assets/default.html"),
 	}

 	if userConfig != nil {
@@ -113,19 +137,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}

+	println("****************************************************")
+	fmt.Printf("%+v\n", result)
+	println("****************************************************")
+
 	return result, nil
 }
-
-var defaultHTML = `<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-</head>
-
-<body>
-  <div id="app"></div>
-</body>
-
-</html>`
--- a/lib/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- a/runtime/assets/default.html
+++ b/runtime/assets/default.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="text/javascript">function AddScript(js, callbackID) {
+      var script = document.createElement('script');
+      script.text = js;
+      document.body.appendChild(script);
+    }</script>
+</body>
+
+</html>
Author	SHA1	Message	Date
Lea Anthony	c42faefd48	Support EndeavourOS	2020-11-26 20:43:22 +11:00
Lea Anthony	25d8a8763a	v1.10.0-pre1	2020-11-01 06:32:42 +11:00
Lea Anthony	7929584ec5	542 use supplied html (#547 ) * Fix custom HTML * Update HTML escaping * Added more docs around config	2020-11-01 06:31:35 +11:00
Lea Anthony	73ee9ef530	v1.9.1	2020-10-31 16:24:35 +11:00
Lea Anthony	003eecc4ff	Fix firebug flag	2020-10-31 16:23:23 +11:00
Lea Anthony	f97341abbe	Revert "Allow use of custom HTML (#545 )" This reverts commit `dc605c1683`.	2020-10-31 16:15:29 +11:00