Fix bugs occuring during tests and rename modules

functions/desktop.go

@@ -1,9 +1,9 @@
 package functions
 
 import (
-	"appImageInstaller/desktopFile"
-	"appImageInstaller/structs"
-	"appImageInstaller/utils"
+	"appinstall/desktopFile"
+	"appinstall/structs"
+	"appinstall/utils"
 	"fmt"
 	"log"
 )

functions/image.go

@@ -1,9 +1,9 @@
 package functions
 
 import (
-	"appImageInstaller/desktopFile"
-	"appImageInstaller/structs"
-	"appImageInstaller/utils"
+	"appinstall/desktopFile"
+	"appinstall/structs"
+	"appinstall/utils"
 	"fmt"
 )
 

go.mod

@@ -1 +1 @@
-module appImageInstaller
+module appinstall

main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	f "appImageInstaller/functions"
-	"appImageInstaller/manager"
-	"appImageInstaller/structs"
-	"appImageInstaller/utils"
+	f "appinstall/functions"
+	"appinstall/manager"
+	"appinstall/structs"
+	"appinstall/utils"
 	"fmt"
 	"log"
 	"os"
@@ -121,7 +121,6 @@ func help() {
 	fmt.Println("(after install use sudo update-desktop-database to reload gnome icons)")
 	fmt.Println("other options [BETA]: ")
 	fmt.Println("-l          #to list installed apps (from this tool only)")
-	fmt.Println("            #can also raise some errors about other desktop files")
 	fmt.Println(" ")
 	fmt.Println("-d appName  #to delete the app (installed by this tool)")
 
@@ -133,7 +132,8 @@ func listing() error {
 	entries := m.List()
 	fmt.Println("Apps:")
 	for _, entry := range entries {
-		fmt.Println(entry.Category("Desktop Entry").Get("Name"))
+		name, _ := entry.Category("Desktop Entry").Get("Name")
+		fmt.Println(name)
 	}
 	return nil
 }
@@ -160,7 +160,7 @@ func chooseScript() error {
 
 func main() {
 
-	if len(os.Args) != 2 || os.Args[1] == "-h" {
+	if os.Args[1] == "-h" {
 		help()
 		os.Exit(0)
 	}

manager/manager.go

@@ -1,11 +1,12 @@
 package manager
 
 import (
-	"appImageInstaller/desktopFile"
-	"appImageInstaller/structs"
+	"appinstall/desktopFile"
+	"appinstall/structs"
 	"fmt"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 )
@@ -33,13 +34,21 @@ func (m *Manager) IsGeneratedDesktop(deskFile *desktopFile.DesktopFile) (bool, e
 }
 
 func (m *Manager) IsValidDesktop(deskFile *desktopFile.DesktopFile) (bool, error) {
-	if !deskFile.HasValues("Desktop Entry", []string{"Get", "Name", "Exec"}) {
+	if !deskFile.HasValues("Desktop Entry", []string{"Name", "Exec"}) {
 		return false, fmt.Errorf("missing basic values")
 	}
-	path, _ := deskFile.Category("Desktop Entry").Get("Exec")
+	cmd, _ := deskFile.Category("Desktop Entry").Get("Exec")
+	words := strings.Split(cmd, " ")
+	if len(words) == 0 {
+		return false, fmt.Errorf("no exec path")
+	}
+	path := words[0]
 	_, err := os.Stat(path)
 	if err != nil {
-		return false, fmt.Errorf("fail to find binary")
+		_, err = exec.LookPath(path)
+		if err != nil {
+			return false, fmt.Errorf("fail to find binary: ", path)
+		}
 	}
 	return true, nil
 }
@@ -60,7 +69,7 @@ func (m *Manager) List() []*desktopFile.DesktopFile {
 		}
 		_, err = m.IsValidDesktop(deskFile)
 		if err != nil {
-			fmt.Println("Listing Error for file:", deskFilePath, " ", err)
+			//fmt.Println("Listing Error for file:", deskFilePath, " ", err)
 			continue
 		}
 		isGenerated, err := m.IsGeneratedDesktop(deskFile)