Compare commits

...

3 Commits

Author SHA1 Message Date
Lea Anthony
5d442947f3 Better error reporting when json error happens 2020-05-22 07:09:19 +10:00
Lea Anthony
6da02e6b44 v1.6.0-pre2 2020-05-17 20:17:36 +10:00
Lea Anthony
7cd78df1cd Support ArchLabs 2020-05-17 20:17:00 +10:00
6 changed files with 21 additions and 7 deletions

View File

@@ -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_
#### Arch Linux
#### Arch Linux / ArchLabs
`sudo pacman -S webkit2gtk gtk3`

View File

@@ -53,10 +53,12 @@ const (
Deepin
// Raspbian distribution
Raspbian
// openSUSE Tumbleweed distribution
// Tumbleweed (OpenSUSE) distribution
Tumbleweed
// openSUSE Leap distribution
// Leap (OpenSUSE) distribution
Leap
// ArchLabs distribution
ArchLabs
)
// 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
switch osID {
switch strings.ToLower(osID) {
case "fedora":
result.Distribution = Fedora
case "centos":
result.Distribution = CentOS
case "arch":
result.Distribution = Arch
case "archlabs":
result.Distribution = ArchLabs
case "debian":
result.Distribution = Debian
case "ubuntu":

View File

@@ -176,6 +176,15 @@ distributions:
gccversioncommand: *gccdumpversion
programs: *archdefaultprograms
libraries: *archdefaultlibraries
archlabs:
id: archlabs
releases:
default:
version: default
name: ArchLabs
gccversioncommand: *gccdumpversion
programs: *archdefaultprograms
libraries: *archdefaultlibraries
manjaro:
id: manjaro
releases:

View File

@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
switch distroInfo.Distribution {
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian:
libraryChecker = DpkgInstalled
case Arch, ArcoLinux, Manjaro, ManjaroARM:
case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
libraryChecker = PacmanInstalled
case CentOS, Fedora, Tumbleweed, Leap:
libraryChecker = RpmInstalled

View File

@@ -1,4 +1,4 @@
package cmd
// Version - Wails version
const Version = "v1.6.0-pre1"
const Version = "v1.6.0-pre2"

View File

@@ -108,7 +108,8 @@ export function Notify(eventName, data) {
try {
parsedData = JSON.parse(data);
} 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