go.mod

@@ -4,5 +4,6 @@ go 1.22
 
 require (
 	github.com/elliotchance/orderedmap/v2 v2.4.0 // indirect
+	github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,9 @@
 github.com/elliotchance/orderedmap/v2 v2.4.0 h1:6tUmMwD9F998FNpwFxA5E6NQvSpk2PVw7RKsVq3+2Cw=
 github.com/elliotchance/orderedmap/v2 v2.4.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q=
+github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
+github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f h1:xt29M2T6STgldg+WEP51gGePQCsQvklmP2eIhPIBK3g=
+github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -47,8 +47,8 @@ func main() {
 type commandType uint8
 
 const (
-	help commandType = iota
+	_default commandType = iota
-	version
+	help
 	info
 	list
 	search
@@ -62,7 +62,7 @@ const (
 func getCommandType() commandType {
 	switch subcommand {
 	case "version":
-		return version
+		return _default
 	case "info":
 		return info
 	case "list":
@@ -86,7 +86,7 @@ func getCommandType() commandType {
 
 func resolveCommand() {
 	switch getCommandType() {
-	case version:
+	case _default:
 		fmt.Println("Bubble Package Manager (BPM)")
 		fmt.Println("Version: " + bpmVer)
 	case info:
@@ -224,7 +224,7 @@ func resolveCommand() {
 		}]()
 		for _, pkg := range clone.Keys() {
 			value, _ := clone.Get(pkg)
-			resolved, unresolved := value.pkgInfo.ResolveAll(&[]string{}, &[]string{}, value.pkgInfo.Type == "source", !noOptional, !reinstall, rootDir)
+			resolved, unresolved := value.pkgInfo.ResolveAll(&[]string{}, &[]string{}, value.pkgInfo.Type == "source", !noOptional, !reinstall, verbose, rootDir)
 			unresolvedDepends = append(unresolvedDepends, unresolved...)
 			for _, depend := range resolved {
 				if _, ok := pkgsToInstall.Get(depend); !ok && depend != value.pkgInfo.Name {
@@ -270,16 +270,20 @@ func resolveCommand() {
 				}
 				sourceInfo = "(From Source)"
 			}
+
 			if installedInfo == nil {
 				fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo)
-			} else if strings.Compare(pkgInfo.GetFullVersion(), installedInfo.GetFullVersion()) < 0 {
+			} else {
+				comparison := utils.ComparePackageVersions(*pkgInfo, *installedInfo)
+				if comparison < 0 {
 					fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo)
-			} else if strings.Compare(pkgInfo.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+				} else if comparison > 0 {
 					fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo)
 				} else {
 					fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo)
 				}
 			}
+		}
 		if rootDir != "/" {
 			fmt.Println("Warning: Operating in " + rootDir)
 		}
@@ -382,8 +386,9 @@ func resolveCommand() {
 			installedInfo := utils.GetPackageInfo(pkg, rootDir, true)
 			if installedInfo == nil {
 				log.Fatalf("Error: could not get package info for (%s)\n", pkg)
-			}
+			} else {
-			if strings.Compare(entry.Info.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+				comparison := utils.ComparePackageVersions(*entry.Info, *installedInfo)
+				if comparison > 0 {
 					toUpdate.Set(entry.Info.Name, &struct {
 						isDependency bool
 						entry        *utils.RepositoryEntry
@@ -395,6 +400,7 @@ func resolveCommand() {
 					}{isDependency: false, entry: entry})
 				}
 			}
+		}
 		if toUpdate.Len() == 0 {
 			fmt.Println("All packages are up to date!")
 			os.Exit(0)
@@ -405,7 +411,7 @@ func resolveCommand() {
 		clone := toUpdate.Copy()
 		for _, key := range clone.Keys() {
 			pkg, _ := clone.Get(key)
-			r, u := pkg.entry.Info.ResolveAll(&[]string{}, &[]string{}, pkg.entry.Info.Type == "source", !noOptional, true, rootDir)
+			r, u := pkg.entry.Info.ResolveAll(&[]string{}, &[]string{}, pkg.entry.Info.Type == "source", !noOptional, true, verbose, rootDir)
 			unresolved = append(unresolved, u...)
 			for _, depend := range r {
 				if _, ok := toUpdate.Get(depend); !ok {
@@ -439,13 +445,15 @@ func resolveCommand() {
 			if installedInfo == nil {
 				fmt.Printf("%s: %s (Install) %s\n", value.entry.Info.Name, value.entry.Info.GetFullVersion(), sourceInfo)
 				continue
-			}
+			} else {
-			if strings.Compare(value.entry.Info.GetFullVersion(), installedInfo.GetFullVersion()) > 0 {
+				comparison := utils.ComparePackageVersions(*value.entry.Info, *installedInfo)
+				if comparison > 0 {
 					fmt.Printf("%s: %s -> %s (Upgrade) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo)
 				} else if reinstall {
 					fmt.Printf("%s: %s -> %s (Reinstall) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo)
 				}
 			}
+		}
 
 		// Update confirmation prompt
 		if !yesAll {

utils/package_utils.go

@@ -6,6 +6,7 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
+	version "github.com/knqyf263/go-rpm-version"
 	"gopkg.in/yaml.v3"
 	"io"
 	"io/fs"
@@ -48,6 +49,13 @@ const (
 	Unknown    InstallationReason = "unknown"
 )
 
+func ComparePackageVersions(info1, info2 PackageInfo) int {
+	v1 := version.NewVersion(info1.GetFullVersion())
+	v2 := version.NewVersion(info2.GetFullVersion())
+
+	return v1.Compare(v2)
+}
+
 func GetInstallationReason(pkg, rootDir string) InstallationReason {
 	installedDir := path.Join(rootDir, "var/lib/bpm/installed/")
 	pkgDir := path.Join(installedDir, pkg)
@@ -308,6 +316,12 @@ func ExecutePackageScripts(filename, rootDir string, operation Operation, postOp
 			}
 		}
 	} else if operation == Remove {
+		if val, ok := scripts["pre_remove.sh"]; !postOperation && ok {
+			err := run("pre_remove.sh", val)
+			if err != nil {
+				return err
+			}
+		}
 		if val, ok := scripts["post_remove.sh"]; postOperation && ok {
 			err := run("post_remove.sh", val)
 			if err != nil {
@@ -1270,11 +1284,21 @@ func (pkgInfo *PackageInfo) CheckConflicts(rootDir string) []string {
 	return ret
 }
 
-func (pkgInfo *PackageInfo) ResolveAll(resolved, unresolved *[]string, checkMake, checkOptional, ignoreInstalled bool, rootDir string) ([]string, []string) {
+func (pkgInfo *PackageInfo) ResolveAll(resolved, unresolved *[]string, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) ([]string, []string) {
 	*unresolved = append(*unresolved, pkgInfo.Name)
 	for _, depend := range pkgInfo.GetAllDependencies(checkMake, checkOptional) {
+		depend = strings.TrimSpace(depend)
+		depend = strings.ToLower(depend)
 		if !slices.Contains(*resolved, depend) {
-			if slices.Contains(*unresolved, depend) || (ignoreInstalled && IsPackageInstalled(depend, rootDir)) {
+			if slices.Contains(*unresolved, depend) {
+				if verbose {
+					fmt.Printf("Circular dependency was detected (%s -> %s). Installing %s first\n", pkgInfo.Name, depend, depend)
+				}
+				if !slices.Contains(*resolved, depend) {
+					*resolved = append(*resolved, depend)
+				}
+				continue
+			} else if ignoreInstalled && IsPackageInstalled(depend, rootDir) {
 				continue
 			}
 			entry, _, err := GetRepositoryEntry(depend)
@@ -1284,7 +1308,7 @@ func (pkgInfo *PackageInfo) ResolveAll(resolved, unresolved *[]string, checkMake
 				}
 				continue
 			}
-			entry.Info.ResolveAll(resolved, unresolved, checkMake, checkOptional, ignoreInstalled, rootDir)
+			entry.Info.ResolveAll(resolved, unresolved, checkMake, checkOptional, ignoreInstalled, verbose, rootDir)
 		}
 	}
 	if !slices.Contains(*resolved, pkgInfo.Name) {

utils/repo_utils.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"os"
 	"path"
+	"sort"
 	"strings"
 )
 
@@ -21,6 +22,7 @@ type Repository struct {
 type RepositoryEntry struct {
 	Info             *PackageInfo `yaml:"info"`
 	Download         string       `yaml:"download"`
+	IsVirtualPackage bool         `yaml:"-"`
 }
 
 func (repo *Repository) ContainsPackage(pkg string) bool {
@@ -39,6 +41,8 @@ func (repo *Repository) ReadLocalDatabase() error {
 		return err
 	}
 
+	virtualPackages := make(map[string][]string)
+
 	data := string(bytes)
 	for _, b := range strings.Split(data, "---") {
 		entry := RepositoryEntry{
@@ -59,13 +63,31 @@ func (repo *Repository) ReadLocalDatabase() error {
 				Provides:        make([]string, 0),
 			},
 			Download:         "",
+			IsVirtualPackage: false,
 		}
 		err := yaml.Unmarshal([]byte(b), &entry)
 		if err != nil {
 			return err
 		}
+
+		for _, p := range entry.Info.Provides {
+			virtualPackages[p] = append(virtualPackages[p], entry.Info.Name)
+		}
 		repo.Entries[entry.Info.Name] = &entry
 	}
+
+	for key, value := range virtualPackages {
+		if _, ok := repo.Entries[key]; ok {
+			continue
+		}
+		sort.Strings(value)
+		entry := RepositoryEntry{
+			Info:             repo.Entries[value[0]].Info,
+			Download:         repo.Entries[value[0]].Download,
+			IsVirtualPackage: true,
+		}
+		repo.Entries[key] = &entry
+	}
 	return nil
 }