Updates to update command

Fix HTML spellings

CONTRIBUTORS.md

@@ -0,0 +1,9 @@
+# Contributors
+
+Wails is what it is because of the time and effort given by these great people. A huge thank you to each and every one!
+
+* [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
+* [Qais Patankar](https://github.com/qaisjp)
+* [Anthony Lee](https://github.com/alee792)
+* [Adrian Lanzafame](https://github.com/lanzafame)
+* [0xflotus](https://github.com/0xflotus)

README.md

@@ -47,6 +47,10 @@ Make sure you have the xcode command line tools installed. This can be done by r
 
 `sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
 
+#### Arch Linux
+
+`sudo pacman -S webkit2gtk gtk3`
+
 Note: If you have successfully installed these dependencies on a different flavour of Linux, please consider submitting a PR.
 
 ### Windows
@@ -73,7 +77,7 @@ It is recommended at this stage to read the comprehensive documentation at [http
 
  * Who is this project aimed at?
 
-   Go programmers who want to bundle an HMTL/JS/CSS frontend with their applications, without resorting to creating a server and opening a browser to view it.
+   Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a server and opening a browser to view it.
 
  * What's with the name?
 
@@ -86,6 +90,8 @@ Without the following people, this project would never have existed:
   * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than you can throw a stick at (Not long now Dustin!).
   * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
 
+And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today.
+
 Special Mentions:
 
   * [Bill Kennedy](https://twitter.com/goinggodotnet) - Go guru, encourager and all-round nice guy, whose infectious energy and inspiration powered me on when I had none left.

app_config.go

@@ -41,7 +41,7 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.HTML = strings.TrimSpace(inlineHTML)
 
 		// Deduce whether this is a full html page or a fragment
-		// The document is determined to be a fragment if an HMTL
+		// The document is determined to be a fragment if an HTML
 		// tag exists and is located before the first div tag
 		HTMLTagIndex := strings.Index(a.HTML, "<html")
 		DivTagIndex := strings.Index(a.HTML, "<div")

cmd/linux.go

@@ -10,9 +10,11 @@ type LinuxDistribution int
 
 const (
 	// Unknown is the catch-all distro
-	Unknown LinuxDistribution = 0
+	Unknown LinuxDistribution = iota
 	// Ubuntu distribution
-	Ubuntu LinuxDistribution = 1
+	Ubuntu
+	// Arch linux distribution
+	Arch
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -49,6 +51,8 @@ func GetLinuxDistroInfo() *DistroInfo {
 					switch value {
 					case "Ubuntu":
 						result.Distribution = Ubuntu
+					case "Arch":
+						result.Distribution = Arch
 					}
 				case "Description":
 					result.Description = value
@@ -75,3 +79,14 @@ func DpkgInstalled(packageName string) (bool, error) {
 	_, _, exitCode, _ := dpkg.Run("-L", packageName)
 	return exitCode == 0, nil
 }
+
+// PacmanInstalled uses pacman to see if a package is installed.
+func PacmanInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	pacman := program.FindProgram("pacman")
+	if pacman == nil {
+		return false, fmt.Errorf("cannot check dependencies: pacman not found")
+	}
+	_, _, exitCode, _ := pacman.Run("-Qs", packageName)
+	return exitCode == 0, nil
+}

cmd/prerequisites.go

@@ -97,6 +97,9 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) {
 	case Ubuntu:
 		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:
+		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"))
 	default:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with your system package manager and try again"))
 		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with your system package manager and try again"))

cmd/program.go

@@ -107,7 +107,7 @@ func (p *ProgramHelper) RunCommand(command string) error {
 }
 
 // RunCommandArray runs the command specified in the array
-func (p *ProgramHelper) RunCommandArray(args []string) error {
+func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 	program := args[0]
 	// TODO: Run FindProgram here and get the full path to the exe
 	program, err := exec.LookPath(program)
@@ -116,8 +116,13 @@ func (p *ProgramHelper) RunCommandArray(args []string) error {
 		return err
 	}
 	args = args[1:]
+	var stderr string
 	// fmt.Printf("RunCommandArray = %s %+v\n", program, args)
-	_, stderr, err := p.shell.Run(program, args...)
+	if len(dir) > 0 {
+		_, stderr, err = p.shell.RunInDirectory(dir[0], program, args...)
+	} else {
+		_, stderr, err = p.shell.Run(program, args...)
+	}
 	if err != nil {
 		fmt.Println(stderr)
 	}

cmd/shell.go

@@ -25,3 +25,16 @@ func (sh *ShellHelper) Run(command string, vars ...string) (stdout, stderr strin
 	stderr = string(stde.Bytes())
 	return
 }
+
+// RunInDirectory runs the given command in the given directory
+func (sh *ShellHelper) RunInDirectory(dir string, command string, vars ...string) (stdout, stderr string, err error) {
+	cmd := exec.Command(command, vars...)
+	cmd.Dir = dir
+	var stdo, stde bytes.Buffer
+	cmd.Stdout = &stdo
+	cmd.Stderr = &stde
+	err = cmd.Run()
+	stdout = string(stdo.Bytes())
+	stderr = string(stde.Bytes())
+	return
+}

cmd/system.go

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

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.11.7"
+const Version = "v0.12.3"

cmd/wails/8_update.go

@@ -4,9 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 
 	"github.com/leaanthony/spinner"
+	"github.com/mitchellh/go-homedir"
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -54,7 +56,14 @@ func init() {
 			updateSpinner := spinner.NewSpinner()
 			updateSpinner.SetSpinSpeed(40)
 			updateSpinner.Start("Updating to  : " + latestVersion)
-			err = cmd.NewProgramHelper().RunCommandArray([]string{"go", "get", "-u", "github.com/wailsapp/wails/cmd/wails"})
+
+			// Run command in non module directory
+			homeDir, err := homedir.Dir()
+			if err != nil {
+				log.Fatal("Cannot find home directory! Please file a bug report!")
+			}
+
+			err = cmd.NewProgramHelper().RunCommandArray([]string{"go", "get", "github.com/wailsapp/wails/.../."}, homeDir)
 			if err != nil {
 				updateSpinner.Error(err.Error())
 				return err

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gorilla/websocket v1.4.0
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/leaanthony/mewn v0.10.4
+	github.com/leaanthony/mewn v0.10.5
 	github.com/leaanthony/slicer v1.3.1
 	github.com/leaanthony/spinner v0.5.0
 	github.com/mattn/go-colorable v0.1.1 // indirect

go.sum

@@ -21,8 +21,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/leaanthony/mewn v0.10.4 h1:b16/E0r6CuXN8WYuDJIgwRocLQlmMjfBsooEJr6FdqY=
-github.com/leaanthony/mewn v0.10.4/go.mod h1:i3ygCWW96qVQlGa8sjWnTM0IKAijoFvTwATDIZgK4k0=
+github.com/leaanthony/mewn v0.10.5 h1:QKYVj8tI94alvVFZer7wPy66IcNpyNPITIkdhXbThX4=
+github.com/leaanthony/mewn v0.10.5/go.mod h1:i3ygCWW96qVQlGa8sjWnTM0IKAijoFvTwATDIZgK4k0=
 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/spinner v0.5.0 h1:HQykt/iTy7fmINEREtRbWrt+8j4MxC8dtvWBxEWM9oA=

scripts/updateversion.sh

@@ -1,8 +1,15 @@
 #!/usr/bin/env bash
-TAG=$(git describe --abbrev=0 --tags)
+if [ "$#" != "1" ]; then 
+  echo "Tag required"
+  exit 1
+fi
+TAG=${1}
 cat << EOF > cmd/version.go
 package cmd
 
 // Version - Wails version
 const Version = "${TAG}"
-EOF
+EOF
+git add cmd/version.go
+git commit cmd/version.go -m "Bump to ${TAG}" 
+git tag ${TAG}