mirror of
https://github.com/taigrr/wails.git
synced 2026-04-17 04:05:12 -07:00
Compare commits
3 Commits
v1.6.0-pre
...
419-better
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d442947f3 | ||
|
|
6da02e6b44 | ||
|
|
7cd78df1cd |
@@ -57,7 +57,7 @@ _Ubuntu: 16.04, 18.04, 19.04_
|
|||||||
|
|
||||||
_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
|
_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
|
||||||
|
|
||||||
#### Arch Linux
|
#### Arch Linux / ArchLabs
|
||||||
|
|
||||||
`sudo pacman -S webkit2gtk gtk3`
|
`sudo pacman -S webkit2gtk gtk3`
|
||||||
|
|
||||||
|
|||||||
10
cmd/linux.go
10
cmd/linux.go
@@ -53,10 +53,12 @@ const (
|
|||||||
Deepin
|
Deepin
|
||||||
// Raspbian distribution
|
// Raspbian distribution
|
||||||
Raspbian
|
Raspbian
|
||||||
// openSUSE Tumbleweed distribution
|
// Tumbleweed (OpenSUSE) distribution
|
||||||
Tumbleweed
|
Tumbleweed
|
||||||
// openSUSE Leap distribution
|
// Leap (OpenSUSE) distribution
|
||||||
Leap
|
Leap
|
||||||
|
// ArchLabs distribution
|
||||||
|
ArchLabs
|
||||||
)
|
)
|
||||||
|
|
||||||
// DistroInfo contains all the information relating to a linux distribution
|
// DistroInfo contains all the information relating to a linux distribution
|
||||||
@@ -114,13 +116,15 @@ func parseOsRelease(osRelease string) *DistroInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check distro name against list of distros
|
// Check distro name against list of distros
|
||||||
switch osID {
|
switch strings.ToLower(osID) {
|
||||||
case "fedora":
|
case "fedora":
|
||||||
result.Distribution = Fedora
|
result.Distribution = Fedora
|
||||||
case "centos":
|
case "centos":
|
||||||
result.Distribution = CentOS
|
result.Distribution = CentOS
|
||||||
case "arch":
|
case "arch":
|
||||||
result.Distribution = Arch
|
result.Distribution = Arch
|
||||||
|
case "archlabs":
|
||||||
|
result.Distribution = ArchLabs
|
||||||
case "debian":
|
case "debian":
|
||||||
result.Distribution = Debian
|
result.Distribution = Debian
|
||||||
case "ubuntu":
|
case "ubuntu":
|
||||||
|
|||||||
@@ -176,6 +176,15 @@ distributions:
|
|||||||
gccversioncommand: *gccdumpversion
|
gccversioncommand: *gccdumpversion
|
||||||
programs: *archdefaultprograms
|
programs: *archdefaultprograms
|
||||||
libraries: *archdefaultlibraries
|
libraries: *archdefaultlibraries
|
||||||
|
archlabs:
|
||||||
|
id: archlabs
|
||||||
|
releases:
|
||||||
|
default:
|
||||||
|
version: default
|
||||||
|
name: ArchLabs
|
||||||
|
gccversioncommand: *gccdumpversion
|
||||||
|
programs: *archdefaultprograms
|
||||||
|
libraries: *archdefaultlibraries
|
||||||
manjaro:
|
manjaro:
|
||||||
id: manjaro
|
id: manjaro
|
||||||
releases:
|
releases:
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
|
|||||||
switch distroInfo.Distribution {
|
switch distroInfo.Distribution {
|
||||||
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian:
|
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian:
|
||||||
libraryChecker = DpkgInstalled
|
libraryChecker = DpkgInstalled
|
||||||
case Arch, ArcoLinux, Manjaro, ManjaroARM:
|
case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
|
||||||
libraryChecker = PacmanInstalled
|
libraryChecker = PacmanInstalled
|
||||||
case CentOS, Fedora, Tumbleweed, Leap:
|
case CentOS, Fedora, Tumbleweed, Leap:
|
||||||
libraryChecker = RpmInstalled
|
libraryChecker = RpmInstalled
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
// Version - Wails version
|
// Version - Wails version
|
||||||
const Version = "v1.6.0-pre1"
|
const Version = "v1.6.0-pre2"
|
||||||
|
|||||||
@@ -108,7 +108,8 @@ export function Notify(eventName, data) {
|
|||||||
try {
|
try {
|
||||||
parsedData = JSON.parse(data);
|
parsedData = JSON.parse(data);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
Error('Invalid JSON data sent to notify. Event name = ' + eventName);
|
e.message =
|
||||||
|
Error('Invalid JSON data sent to notify [Event name = ' + eventName + '] ' + e.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Do the callback
|
// Do the callback
|
||||||
|
|||||||
Reference in New Issue
Block a user