Merge commit 'f9a18817b74828ff8fae92a1a873087f9adc363b' of https://github.com/wailsapp/wails into v0.13.0-pre

cmd/linux.go

@@ -2,6 +2,9 @@ package cmd
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"regexp"
 	"strings"
 )
 
@@ -15,6 +18,8 @@ const (
 	Ubuntu
 	// Arch linux distribution
 	Arch
+	// RedHat linux distribution
+	RedHat
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -64,7 +69,19 @@ func GetLinuxDistroInfo() *DistroInfo {
 				}
 			}
 		}
-
+		// check if /etc/os-release exists
+	} else if _, err := os.Stat("/etc/os-release"); !os.IsNotExist(err) {
+		// read /etc/os-release
+		osRelease, _ := ioutil.ReadFile("/etc/os-release")
+		// compile a regex to find NAME=distro
+		re := regexp.MustCompile(`^NAME=(.*)\n`)
+		// extract the distro name
+		osName := string(re.FindSubmatch(osRelease)[1])
+		// Check distro name against list of RedHat distros
+		if osName == "Fedora" || osName == "CentOS" {
+			//if it matches set result.Distribution to RedHat
+			result.Distribution = RedHat
+		}
 	}
 	return result
 }
@@ -90,3 +107,14 @@ func PacmanInstalled(packageName string) (bool, error) {
 	_, _, exitCode, _ := pacman.Run("-Qs", packageName)
 	return exitCode == 0, nil
 }
+
+// YumInstalled uses yum to see if a package is installed
+func YumInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	yum := program.FindProgram("yum")
+	if yum == nil {
+		return false, fmt.Errorf("cannot check dependencies: yum not found")
+	}
+	_, _, exitCode, _ := yum.Run("list", packageName, "--available")
+	return exitCode == 0, nil
+}

cmd/prerequisites.go

@@ -99,7 +99,10 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) {
 		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"))
+		result.Add(newPrerequisite("webkit2gtk", "Please install with `sudo pacman -S webkit2gtk` and try again"))
+	case RedHat:
+		result.Add(newPrerequisite("gtk3-devel", "Please install with `sudo yum install gtk3-devel` and try again"))
+		result.Add(newPrerequisite("webkit2gtk3-devel", "Please install with `sudo yum install webkit2gtk3-devel` and try again"))
 	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/system.go

@@ -283,6 +283,18 @@ func CheckDependencies(logger *Logger) (bool, error) {
 				} else {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
+			case RedHat:
+
+				installed, err := YumInstalled(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)
 			}