Compare commits

..

6 Commits

Author SHA1 Message Date
Lea Anthony
5af6b7cafe chore: bump version 2019-08-10 10:50:25 +10:00
Lea Anthony
68ac3763d0 chore: update linux db 2019-08-10 10:43:09 +10:00
admin_3.exe
cdc66b556e 188 support distribution linux mint (#189) 2019-08-10 10:42:02 +10:00
admin_3.exe
3ff16322c2 182 linux bd (#183)
* fix: linuxdb.yaml entries

* fix: typo

* fix: yaml syntax error
2019-08-09 20:21:01 +10:00
Lea Anthony
d60066a0b1 chore: linter fixes (#185) 2019-08-09 08:12:50 +10:00
Lea Anthony
9d6ebf0fd4 Linux db (#182)
* feat: refactor linux distro detection

* linux db updates

* feat: add gccversioncommand + windows support

* fix: build-essential
2019-08-08 21:04:59 +10:00
8 changed files with 56 additions and 45 deletions

View File

@@ -46,7 +46,7 @@ Make sure you have the xcode command line tools installed. This can be done by r
### Linux ### Linux
#### Debian 9, Ubuntu 18.04, Zorin 15, Parrot 4.7 #### Debian 9, Ubuntu 18.04, Zorin 15, Parrot 4.7, Linuxmint 19
`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev` `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 // GetVersionTags gets the list of tags on the Wails repo
// It retuns a list of sorted tags in descending order // It returns a list of sorted tags in descending order
func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) { func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
result := []*SemanticVersion{} result := []*SemanticVersion{}

View File

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

View File

@@ -1,33 +1,33 @@
--- ---
distributions: distributions:
ubuntu:
id: ubuntu
releases:
default:
name: Ubuntu
version: default
gccversioncommand: &gccdumpfullversion -dumpfullversion
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: debian:
id: debian id: debian
releases: releases:
default: default:
version: default
name: Debian name: Debian
version: default
gccversioncommand: &gccdumpversion -dumpversion gccversioncommand: &gccdumpversion -dumpversion
programs: *ubuntudefaultprograms programs: &debiandefaultprograms
libraries: *ubuntudefaultlibraries - 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
gccversioncommand: &gccdumpfullversion -dumpfullversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
parrot: parrot:
id: parrot id: parrot
releases: releases:
@@ -35,8 +35,8 @@ distributions:
version: default version: default
name: Parrot name: Parrot
gccversioncommand: *gccdumpversion gccversioncommand: *gccdumpversion
programs: *ubuntudefaultprograms programs: *debiandefaultprograms
libraries: *ubuntudefaultlibraries libraries: *debiandefaultlibraries
zorin: zorin:
id: zorin id: zorin
releases: releases:
@@ -44,14 +44,17 @@ distributions:
version: default version: default
name: Zorin name: Zorin
gccversioncommand: *gccdumpversion gccversioncommand: *gccdumpversion
programs: programs: *debiandefaultprograms
- name: gcc libraries: *debiandefaultlibraries
help: Please install with `sudo apt install build-essential` and try again linuxmint:
- name: pkg-config id: linuxmint
help: Please install with `sudo apt install pkg-config` and try again releases:
- name: npm default:
help: Please install with `sudo snap install node --channel=12/stable --classic` and try again version: default
libraries: *ubuntudefaultlibraries name: Linuxmint
gccversioncommand: *gccdumpversion
programs: *debiandefaultprograms
libraries: *debiandefaultlibraries
centos: centos:
id: centos id: centos
releases: releases:
@@ -65,12 +68,12 @@ distributions:
- name: pkg-config - name: pkg-config
help: Please install with `sudo yum install pkgconf-pkg-config` and try again help: Please install with `sudo yum install pkgconf-pkg-config` and try again
- name: npm - name: npm
help: Please install with `curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && sudo yum install -y nodejs` and try again help: Please install with `sudo yum install nodejs` and try again
libraries: &centosdefaultlibraries libraries:
- name: gtk3-devel - name: gtk3-devel
help: Please install with `sudo yum install gtk3-devel` and try again help: Please install with `sudo yum install gtk3-devel` and try again
- name: webkit2gtk3-devel - name: webkitgtk3-devel
help: Please install with `sudo yum install webkit2gtk3-devel` and try again help: Please install with `sudo yum install webkitgtk3-devel` and try again
fedora: fedora:
id: fedora id: fedora
releases: releases:
@@ -84,8 +87,12 @@ distributions:
- name: pkg-config - name: pkg-config
help: Please install with `sudo yum install pkgconf-pkg-config` and try again help: Please install with `sudo yum install pkgconf-pkg-config` and try again
- name: npm - name: npm
help: Please install `sudo yum install -y nodejs` and try again help: Please install `sudo yum install nodejs` and try again
libraries: *centosdefaultlibraries 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
arch: arch:
id: arch id: arch
releases: releases:
@@ -121,4 +128,4 @@ distributions:
- name: pkg-config - name: pkg-config
help: Please install using your system's package manager help: Please install using your system's package manager
- name: npm - 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() distroInfo := GetLinuxDistroInfo()
for _, library := range *requiredLibraries { for _, library := range *requiredLibraries {
switch distroInfo.Distribution { switch distroInfo.Distribution {
case Ubuntu, Debian, Zorin, Parrot: case Ubuntu, Debian, Zorin, Parrot, Linuxmint:
installed, err := DpkgInstalled(library.Name) installed, err := DpkgInstalled(library.Name)
if err != nil { if err != nil {
return false, err return false, err

View File

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

View File

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