chore: hotfix

README.md

@@ -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
+#### Ubuntu 18.04, Debian 9, Zorin 15
 
 `sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
 
@@ -54,17 +54,13 @@ Make sure you have the xcode command line tools installed. This can be done by r
 
 `sudo pacman -S webkit2gtk gtk3`
 
-#### Centos 7
-
-`sudo yum install webkitgtk3-devel gtk3-devel`
-
 #### Fedora 30
 
 `sudo yum install webkit2gtk3-devel gtk3-devel`
 
-#### Gentoo
+#### Centos 7
 
-`sudo emerge gtk+:3 webkit-gtk`
+`sudo yum install webkitgtk3-devel gtk3-devel`
 
 ### Windows
 

cmd/linux.go

@@ -17,22 +17,22 @@ type LinuxDistribution int
 const (
 	// Unknown is the catch-all distro
 	Unknown LinuxDistribution = iota
-	// Debian distribution
-	Debian
 	// Ubuntu distribution
 	Ubuntu
 	// Arch linux distribution
 	Arch
+	// RedHat linux distribution
+	RedHat
 	// CentOS linux distribution
 	CentOS
 	// Fedora linux distribution
 	Fedora
+	// Debian distribution
+	Debian
 	// Gentoo distribution
 	Gentoo
 	// Zorin distribution
 	Zorin
-	// Parrot distribution
-	Parrot
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -81,22 +81,20 @@ func GetLinuxDistroInfo() *DistroInfo {
 		result.Release = version
 		result.DiscoveredBy = "/etc/os-release"
 		switch osID {
-		case "debian":
-			result.Distribution = Debian
-		case "ubuntu":
-			result.Distribution = Ubuntu
-		case "arch":
-			result.Distribution = Arch
 		case "fedora":
 			result.Distribution = Fedora
 		case "centos":
 			result.Distribution = CentOS
+		case "arch":
+			result.Distribution = Arch
+		case "debian":
+			result.Distribution = Debian
+		case "ubuntu":
+			result.Distribution = Ubuntu
 		case "gentoo":
 			result.Distribution = Gentoo
 		case "zorin":
 			result.Distribution = Zorin
-		case "parrot":
-			result.Distribution = Parrot
 		default:
 			result.Distribution = Unknown
 		}

cmd/prerequisites.go

@@ -57,30 +57,18 @@ func getRequiredProgramsLinux() *Prerequisites {
 		result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again"))
 		result.Add(newPrerequisite("npm", "Please install with `curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - && sudo apt-get install -y nodejs` and try again"))
-	case Arch:
-		result.Add(newPrerequisite("gcc", "Please install with `sudo pacman -S base-devel` and try again"))
-		result.Add(newPrerequisite("pkg-config", "Please install with `sudo pacman -S base-devel` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `pacman -S npm nodejs` and try again"))
-	case CentOS:
-		result.Add(newPrerequisite("gcc", "Please install with `sudo yum install gcc gcc-c++ make` and try again"))
-		result.Add(newPrerequisite("pkg-config", "Please install with `sudo yum install pkgconfig` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && sudo yum install -y nodejs` and try again"))
-	case Fedora:
-		result.Add(newPrerequisite("gcc", "Please install with `sudo yum install gcc-c++ make` and try again"))
-		result.Add(newPrerequisite("pkg-config", "Please install with `sudo yum install pkgconf-pkg-config` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `curl -sL https://rpm.nodesource.com/setup_12.x |  sudo bash - && sudo yum install -y nodejs` and try again"))
-	case Gentoo:
-		result.Add(newPrerequisite("gcc", "Please install with `sudo emerge gcc make` and try again"))
-		result.Add(newPrerequisite("pkg-config", "Please install with `sudo emerge pkg-config` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `sudo emerge nodejs` and try again"))
 	case Zorin:
 		result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again"))
 		result.Add(newPrerequisite("npm", "Please install with `sudo snap install node --channel=12/stable --classic` and try again"))
-	case Parrot:
-		result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again"))
-		result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `sudo apt install npm nodejs` and try again"))
+	case Fedora:
+		result.Add(newPrerequisite("gcc", "Please install with `sudo yum install gcc-c++ make` and try again"))
+		result.Add(newPrerequisite("pkg-config", "Please install with `sudo yum install pkgconf-pkg-config` and try again"))
+		result.Add(newPrerequisite("npm", "Please install with `curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && sudo yum install -y nodejs` and try again"))
+	case CentOS:
+		result.Add(newPrerequisite("gcc", "Please install with `sudo yum install gcc gcc-c++ make` and try again"))
+		result.Add(newPrerequisite("pkg-config", "Please install with `sudo yum install pkgconfig` and try again"))
+		result.Add(newPrerequisite("npm", "Please install with `curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && sudo yum install -y nodejs` and try again"))
 	default:
 		result.Add(newPrerequisite("gcc", "Please install with your system package manager and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with your system package manager and try again"))
@@ -126,24 +114,21 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) {
 	case Ubuntu:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again"))
 		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` and try again"))
-	case CentOS:
-		result.Add(newPrerequisite("gtk3-devel", "Please install with `sudo yum install gtk3-devel` and try again"))
-		result.Add(newPrerequisite("webkitgtk3-devel", "Please install with `sudo yum install webkitgtk3-devel` and try again"))
-	case Fedora:
-		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"))
-	case Gentoo:
-		result.Add(newPrerequisite("gtk+:3", "Please install with `sudo emerge gtk+:3` and try again"))
-		result.Add(newPrerequisite("webkit-gtk", "Please install with `sudo emerge webkit-gtk` and try again"))
 	case Zorin:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again"))
 		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again"))
-	case Parrot:
-		result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again"))
-		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again"))
+	case Gentoo:
+		result.Add(newPrerequisite("gtk+:3", "Please install with `sudo emerge gtk+:3` and try again"))
+		result.Add(newPrerequisite("webkit-gtk", "Please install with `sudo emerge webkit-gtk` 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` and try again"))
+	case Fedora:
+		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"))
+	case CentOS:
+		result.Add(newPrerequisite("gtk3-devel", "Please install with `sudo yum install gtk3-devel` and try again"))
+		result.Add(newPrerequisite("webkitgtk3-devel", "Please install with `sudo yum install webkitgtk3-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

@@ -272,7 +272,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 		for _, library := range *requiredLibraries {
 			switch distroInfo.Distribution {
-			case Ubuntu, Debian, Zorin, Parrot:
+			case Ubuntu, Zorin, Debian:
 				installed, err := DpkgInstalled(library.Name)
 				if err != nil {
 					return false, err
@@ -294,7 +294,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 				} else {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
-			case CentOS, Fedora:
+			case RedHat, Fedora, CentOS:
 				installed, err := RpmInstalled(library.Name)
 				if err != nil {
 					return false, err

cmd/version.go

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

cmd/wails/9_issue.go

@@ -42,12 +42,10 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 			gomodule = "(Not Set)"
 		}
 
-		// get version numbers for GCC, node & npm
+		// Get versions for GCC, node & npm
 		program := cmd.NewProgramHelper()
-		// string helpers
 		var gccVersion, nodeVersion, npmVersion string
 
-		// choose between OS (mac,linux,win)
 		switch runtime.GOOS {
 		case "darwin":
 			gcc := program.FindProgram("gcc")
@@ -56,23 +54,11 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 				gccVersion = strings.TrimSpace(stdout)
 			}
 		case "linux":
-			// for linux we have to collect
-			// the distribution name
-			distro := cmd.GetLinuxDistroInfo()
-			// and use it as nested switch
-			switch distro.ID {
-			default: // most supported distros are printing the right result with just 'gcc -dumpversion'
-				gcc := program.FindProgram("gcc")
-				if gcc != nil {
-					stdout, _, _, _ := gcc.Run("-dumpversion")
-					gccVersion = strings.TrimSpace(stdout)
-				}
-			case "fedora", "ubuntu": // except fedora & ubuntu that require 'gcc -dumpfullversion'
-				gcc := program.FindProgram("gcc")
-				if gcc != nil {
-					stdout, _, _, _ := gcc.Run("-dumpfullversion")
-					gccVersion = strings.TrimSpace(stdout)
-				}
+			gcc := program.FindProgram("gcc")
+			if gcc != nil {
+				gccVersion, _, _, _ := gcc.Run("-dumpfullversion")
+				gccVersion = gccVersion[:len(gccVersion)-1]
+				gccVersion = strings.TrimSpace(gccVersion)
 			}
 
 			// TODO: windows support