fix: popos ID

Added link to guide in request process

cmd/linux.go

@@ -61,8 +61,6 @@ const (
 	ArchLabs
 	// PopOS distribution
 	PopOS
-	// Solus distribution
-	Solus
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -111,7 +109,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		}
 		switch splitLine[0] {
 		case "ID":
-			osID = strings.ToLower(strings.Trim(splitLine[1], "\""))
+			osID = strings.Trim(splitLine[1], "\"")
 		case "NAME":
 			osNAME = strings.Trim(splitLine[1], "\"")
 		case "VERSION_ID":
@@ -120,7 +118,7 @@ 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":
@@ -165,8 +163,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Leap
 	case "pop":
 		result.Distribution = PopOS
-	case "solus":
-		result.Distribution = Solus
 	default:
 		result.Distribution = Unknown
 	}
@@ -203,17 +199,6 @@ func DpkgInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// EOpkgInstalled uses dpkg to see if a package is installed
-func EOpkgInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	eopkg := program.FindProgram("eopkg")
-	if eopkg == nil {
-		return false, fmt.Errorf("cannot check dependencies: eopkg not found")
-	}
-	stdout, _, _, _ := eopkg.Run("info", packageName)
-	return strings.HasPrefix(stdout, "Installed"), nil
-}
-
 // PacmanInstalled uses pacman to see if a package is installed.
 func PacmanInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()

cmd/linuxdb.yaml

@@ -241,25 +241,6 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-  solus:
-    id: solus
-    releases:
-      default:
-        version: default
-        name: Solus
-        gccversioncommand: *gccdumpfullversion
-        programs: &solusdefaultprograms
-          - name: gcc
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: pkg-config
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: npm
-            help: Please install with `sudo eopkg it nodejs` and try again
-        libraries: &solusdefaultlibraries
-          - name: libgtk-3-devel
-            help: Please install with `sudo eopkg it libgtk-3-devel` and try again
-          - name: libwebkit-gtk-devel
-            help: Please install with `sudo eopkg it libwebkit-gtk-devel` and try again
         
   opensuse-tumbleweed:
     id: opensuse-tumbleweed

cmd/system.go

@@ -284,8 +284,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = EqueryInstalled
 		case VoidLinux:
 			libraryChecker = XbpsInstalled
-		case Solus:
-			libraryChecker = EOpkgInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/version.go

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

cmd/wails/6_serve.go

@@ -35,6 +35,8 @@ func init() {
 
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
+		projectOptions.Verbose = verbose
+		projectOptions.Platform = runtime.GOOS
 
 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -44,10 +46,6 @@ func init() {
 			return err
 		}
 
-		// Set project options
-		projectOptions.Verbose = verbose
-		projectOptions.Platform = runtime.GOOS
-
 		// Save project directory
 		projectDir := fs.Cwd()