Compare commits

..

5 Commits

Author SHA1 Message Date
Lea Anthony
c93d01f80f fix: build-essential 2019-08-07 18:32:45 +10:00
Lea Anthony
eca750e895 feat: add gccversioncommand + windows support 2019-08-07 08:54:28 +10:00
Lea Anthony
6b78cdd838 Merge branch 'develop' into linux-db 2019-08-06 18:26:38 +10:00
Lea Anthony
2a3cb35dc1 linux db updates 2019-08-06 18:18:42 +10:00
Lea Anthony
af6b631b7b feat: refactor linux distro detection 2019-08-05 21:54:25 +10:00
8 changed files with 45 additions and 56 deletions

View File

@@ -46,7 +46,7 @@ Make sure you have the xcode command line tools installed. This can be done by r
### Linux
#### Debian 9, Ubuntu 18.04, Zorin 15, Parrot 4.7, Linuxmint 19
#### Debian 9, Ubuntu 18.04, Zorin 15, Parrot 4.7
`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`

File diff suppressed because one or more lines are too long

View File

@@ -18,7 +18,7 @@ func NewGitHubHelper() *GitHubHelper {
}
// GetVersionTags gets the list of tags on the Wails repo
// It returns a list of sorted tags in descending order
// It retuns a list of sorted tags in descending order
func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
result := []*SemanticVersion{}

View File

@@ -33,8 +33,6 @@ const (
Zorin
// Parrot distribution
Parrot
// Linuxmint distribution
Linuxmint
)
// DistroInfo contains all the information relating to a linux distribution
@@ -109,8 +107,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
result.Distribution = Zorin
case "parrot":
result.Distribution = Parrot
case "linuxmint":
result.Distribution = Linuxmint
default:
result.Distribution = Unknown
}

View File

@@ -1,33 +1,33 @@
---
distributions:
debian:
id: debian
releases:
default:
name: Debian
version: default
gccversioncommand: &gccdumpversion -dumpversion
programs: &debiandefaultprograms
- name: gcc
help: Please install with `sudo apt-get install build-essential` and try again
- name: pkg-config
help: Please install with `sudo apt-get install pkg-config` and try again
- name: npm
help: Please install with `curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - && sudo apt-get install -y nodejs` and try again
libraries: &debiandefaultlibraries
- name: libgtk-3-dev
help: Please install with `sudo apt-get install libgtk-3-dev` and try again
- name: libwebkit2gtk-4.0-dev
help: Please install with `sudo apt-get install libwebkit2gtk-4.0-dev` and try again
ubuntu:
id: ubuntu
releases:
default:
version: default
name: Ubuntu
version: default
gccversioncommand: &gccdumpfullversion -dumpfullversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
programs: &ubuntudefaultprograms
- name: gcc
help: Please install with `sudo apt install build-essential` and try again
- name: pkg-config
help: Please install with `sudo apt install pkg-config` and try again
- name: npm
help: Please install with `curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - && sudo apt-get install -y nodejs` and try again
libraries: &ubuntudefaultlibraries
- name: libgtk-3-dev
help: Please install with `sudo apt install libgtk-3-dev` and try again
- name: libwebkit2gtk-4.0-dev
help: Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again
debian:
id: debian
releases:
default:
version: default
name: Debian
gccversioncommand: &gccdumpversion -dumpversion
programs: *ubuntudefaultprograms
libraries: *ubuntudefaultlibraries
parrot:
id: parrot
releases:
@@ -35,8 +35,8 @@ distributions:
version: default
name: Parrot
gccversioncommand: *gccdumpversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
programs: *ubuntudefaultprograms
libraries: *ubuntudefaultlibraries
zorin:
id: zorin
releases:
@@ -44,17 +44,14 @@ distributions:
version: default
name: Zorin
gccversioncommand: *gccdumpversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
linuxmint:
id: linuxmint
releases:
default:
version: default
name: Linuxmint
gccversioncommand: *gccdumpversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
programs:
- name: gcc
help: Please install with `sudo apt install build-essential` and try again
- name: pkg-config
help: Please install with `sudo apt install pkg-config` and try again
- name: npm
help: Please install with `sudo snap install node --channel=12/stable --classic` and try again
libraries: *ubuntudefaultlibraries
centos:
id: centos
releases:
@@ -68,12 +65,12 @@ distributions:
- name: pkg-config
help: Please install with `sudo yum install pkgconf-pkg-config` and try again
- name: npm
help: Please install with `sudo yum install nodejs` and try again
libraries:
help: Please install with `curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && sudo yum install -y nodejs` and try again
libraries: &centosdefaultlibraries
- name: gtk3-devel
help: Please install with `sudo yum install gtk3-devel` and try again
- name: webkitgtk3-devel
help: Please install with `sudo yum install webkitgtk3-devel` and try again
- name: webkit2gtk3-devel
help: Please install with `sudo yum install webkit2gtk3-devel` and try again
fedora:
id: fedora
releases:
@@ -87,12 +84,8 @@ distributions:
- name: pkg-config
help: Please install with `sudo yum install pkgconf-pkg-config` and try again
- name: npm
help: Please install `sudo yum install nodejs` and try again
libraries:
- name: gtk3-devel
help: Please install with `sudo yum install gtk3-devel` and try again
- name: webkit2gtk3-devel
help: Please install with `sudo yum install webkit2gtk3-devel` and try again
help: Please install `sudo yum install -y nodejs` and try again
libraries: *centosdefaultlibraries
arch:
id: arch
releases:
@@ -128,4 +121,4 @@ distributions:
- name: pkg-config
help: Please install using your system's package manager
- name: npm
help: Please install using your system's package manager
help: Please install using your system's package manager

View File

@@ -272,7 +272,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
distroInfo := GetLinuxDistroInfo()
for _, library := range *requiredLibraries {
switch distroInfo.Distribution {
case Ubuntu, Debian, Zorin, Parrot, Linuxmint:
case Ubuntu, Debian, Zorin, Parrot:
installed, err := DpkgInstalled(library.Name)
if err != nil {
return false, err

View File

@@ -67,7 +67,7 @@ func NewTemplateHelper() *TemplateHelper {
}
}
// IsValidTemplate returns true if the given template name resides on disk
// IsValidTemplate returns true if the given tempalte name resides on disk
func (t *TemplateHelper) IsValidTemplate(templateName string) bool {
pathToTemplate := filepath.Join(t.templateDir.fullPath, templateName)
return t.fs.DirExists(pathToTemplate)

View File

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