Merge branch 'improve_bpm_structure' into 'master'

Switch to new BPM file structure

See merge request bubble-package-manager/bpm!8

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 CapCreeperGR
+Copyright (c) 2024 EnumDev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
-	"github.com/elliotchance/orderedmap/v2"
 	"gitlab.com/bubble-package-manager/bpm/utils"
 	"log"
 	"os"
@@ -13,12 +12,12 @@ import (
 	"strings"
 )
 
-/* ---BPM | Bubble Package Manager--- */
+/* -------------BPM | Bubble Package Manager-------------- */
-/*        Made By CapCreeperGR        */
+/*        Made By EnumDev (Previously CapCreeperGR)        */
 /*             A simple-to-use package manager             */
-/* ---------------------------------- */
+/* ------------------------------------------------------- */
 
-var bpmVer = "0.4"
+var bpmVer = "0.5.0"
 
 var subcommand = "help"
 var subcommandArgs []string
@@ -47,8 +46,8 @@ func main() {
 type commandType uint8
 
 const (
-	help commandType = iota
+	_default commandType = iota
-	version
+	help
 	info
 	list
 	search
@@ -62,7 +61,7 @@ const (
 func getCommandType() commandType {
 	switch subcommand {
 	case "version":
-		return version
+		return _default
 	case "info":
 		return info
 	case "list":
@@ -86,7 +85,7 @@ func getCommandType() commandType {
 
 func resolveCommand() {
 	switch getCommandType() {
-	case version:
+	case _default:
 		fmt.Println("Bubble Package Manager (BPM)")
 		fmt.Println("Version: " + bpmVer)
 	case info:
@@ -97,9 +96,9 @@ func resolveCommand() {
 		}
 		for n, pkg := range packages {
 			var info *utils.PackageInfo
-			info = utils.GetPackageInfo(pkg, rootDir, false)
+			info = utils.GetPackageInfo(pkg, rootDir)
 			if info == nil {
-				log.Fatalf("Package (%s) is not installed\n", pkg)
+				log.Fatalf("Error: package (%s) is not installed\n", pkg)
 			}
 			fmt.Println("----------------")
 			fmt.Println(utils.CreateReadableInfo(true, true, true, info, rootDir))
@@ -110,7 +109,7 @@ func resolveCommand() {
 	case list:
 		packages, err := utils.GetInstalledPackages(rootDir)
 		if err != nil {
-			log.Fatalf("Could not get installed packages\nError: %s", err.Error())
+			log.Fatalf("Error: could not get installed packages: %s", err.Error())
 			return
 		}
 		if pkgListNumbers {
@@ -125,7 +124,7 @@ func resolveCommand() {
 				return
 			}
 			for n, pkg := range packages {
-				info := utils.GetPackageInfo(pkg, rootDir, false)
+				info := utils.GetPackageInfo(pkg, rootDir)
 				if info == nil {
 					fmt.Printf("Package (%s) could not be found\n", pkg)
 					continue
@@ -139,8 +138,7 @@ func resolveCommand() {
 	case search:
 		searchTerms := subcommandArgs
 		if len(searchTerms) == 0 {
-			fmt.Println("No search terms given")
+			log.Fatalf("Error: no search terms given")
-			os.Exit(0)
 		}
 
 		for _, term := range searchTerms {
@@ -157,18 +155,17 @@ func resolveCommand() {
 			}
 			results := append(nameResults, descResults...)
 			if len(results) == 0 {
-				log.Fatalf("No results for term (%s) were found\n", term)
+				log.Fatalf("Error: no results for term (%s) were found\n", term)
 			}
 			fmt.Printf("Results for term (%s)\n", term)
 			for i, result := range results {
 				fmt.Println("----------------")
-				fmt.Printf("%d) %s: %s (%s)\n", i+1, result.Name, result.Description, result.Version)
+				fmt.Printf("%d) %s: %s (%s)\n", i+1, result.Name, result.Description, result.GetFullVersion())
 			}
 		}
 	case install:
 		if os.Getuid() != 0 {
-			fmt.Println("This subcommand needs to be run with superuser permissions")
+			log.Fatalf("Error: this subcommand needs to be run with superuser permissions")
-			os.Exit(0)
 		}
 		pkgs := subcommandArgs
 		if len(pkgs) == 0 {
@@ -176,197 +173,82 @@ func resolveCommand() {
 			return
 		}
 
-		pkgsToInstall := orderedmap.NewOrderedMap[string, *struct {
+		operation := utils.BPMOperation{
-			isDependency bool
+			Actions:           make([]utils.OperationAction, 0),
-			pkgInfo      *utils.PackageInfo
+			UnresolvedDepends: make([]string, 0),
-		}]()
+			RootDir:           rootDir,
-		pkgsToFetch := orderedmap.NewOrderedMap[string, *struct {
+		}
-			isDependency bool
-			pkgInfo      *utils.PackageInfo
-		}]()
-		unresolvedDepends := make([]string, 0)
 
 		// Search for packages
 		for _, pkg := range pkgs {
 			if stat, err := os.Stat(pkg); err == nil && !stat.IsDir() {
-				pkgInfo, err := utils.ReadPackage(pkg)
+				bpmpkg, err := utils.ReadPackage(pkg)
 				if err != nil {
-					log.Fatalf("Could not read package. Error: %s\n", err)
+					log.Fatalf("Error: could not read package: %s\n", err)
 				}
-				if !reinstall && utils.IsPackageInstalled(pkgInfo.Name, rootDir) && utils.GetPackageInfo(pkgInfo.Name, rootDir, true).Version == pkgInfo.Version {
+				if !reinstall && utils.IsPackageInstalled(bpmpkg.PkgInfo.Name, rootDir) && utils.GetPackageInfo(bpmpkg.PkgInfo.Name, rootDir).GetFullVersion() == bpmpkg.PkgInfo.GetFullVersion() {
 					continue
 				}
-				pkgsToInstall.Set(pkg, &struct {
+				operation.Actions = append(operation.Actions, &utils.InstallPackageAction{
-					isDependency bool
+					File:         pkg,
-					pkgInfo      *utils.PackageInfo
+					IsDependency: false,
-				}{isDependency: false, pkgInfo: pkgInfo})
+					BpmPackage:   bpmpkg,
+				})
 			} else {
 				entry, _, err := utils.GetRepositoryEntry(pkg)
 				if err != nil {
-					log.Fatalf("Could not find package (%s) in any repository\n", pkg)
+					log.Fatalf("Error: could not find package (%s) in any repository\n", pkg)
 				}
-				if !reinstall && utils.IsPackageInstalled(entry.Info.Name, rootDir) && utils.GetPackageInfo(entry.Info.Name, rootDir, true).Version == entry.Info.Version {
+				if !reinstall && utils.IsPackageInstalled(entry.Info.Name, rootDir) && utils.GetPackageInfo(entry.Info.Name, rootDir).GetFullVersion() == entry.Info.GetFullVersion() {
 					continue
 				}
-				pkgsToFetch.Set(entry.Info.Name, &struct {
+				operation.Actions = append(operation.Actions, &utils.FetchPackageAction{
-					isDependency bool
+					IsDependency:    false,
-					pkgInfo      *utils.PackageInfo
+					RepositoryEntry: entry,
-				}{isDependency: false, pkgInfo: entry.Info})
+				})
 			}
 		}
 
-		// Check for dependencies and conflicts
+		// Resolve dependencies
-		clone := pkgsToFetch.Copy()
+		err := operation.ResolveDependencies(reinstallAll, !noOptional, verbose)
-		pkgsToFetch = orderedmap.NewOrderedMap[string, *struct {
-			isDependency bool
-			pkgInfo      *utils.PackageInfo
-		}]()
-		for _, pkg := range clone.Keys() {
-			value := clone.GetElement(pkg).Value
-			resolved, unresolved := value.pkgInfo.ResolveAll(&[]string{}, &[]string{}, false, !noOptional, !reinstall, rootDir)
-			unresolvedDepends = append(unresolvedDepends, unresolved...)
-			for _, depend := range resolved {
-				if _, ok := pkgsToFetch.Get(depend); !ok && depend != value.pkgInfo.Name {
-					if !reinstallAll && utils.IsPackageInstalled(depend, rootDir) {
-						continue
-					}
-					entry, _, err := utils.GetRepositoryEntry(depend)
 		if err != nil {
-						log.Fatalf("Could not find package (%s) in any repository\n", pkg)
+			log.Fatalf("Error: could not resolve dependencies: %s\n", err)
-					}
-					pkgsToFetch.Set(depend, &struct {
-						isDependency bool
-						pkgInfo      *utils.PackageInfo
-					}{isDependency: true, pkgInfo: entry.Info})
-				}
-			}
-			pkgsToFetch.Set(pkg, value)
-		}
-
-		for _, pkg := range pkgsToInstall.Keys() {
-			value, _ := pkgsToInstall.Get(pkg)
-			resolved, unresolved := value.pkgInfo.ResolveAll(&[]string{}, &[]string{}, false, !noOptional, !reinstall, rootDir)
-			unresolvedDepends = append(unresolvedDepends, unresolved...)
-			for _, depend := range resolved {
-				if _, ok := clone.Get(depend); !ok && depend != value.pkgInfo.Name {
-					if !reinstallAll && utils.IsPackageInstalled(depend, rootDir) {
-						continue
-					}
-					entry, _, err := utils.GetRepositoryEntry(depend)
-					if err != nil {
-						log.Fatalf("Could not find package (%s) in any repository\n", pkg)
-					}
-					pkgsToFetch.Set(depend, &struct {
-						isDependency bool
-						pkgInfo      *utils.PackageInfo
-					}{isDependency: true, pkgInfo: entry.Info})
 		}
+		if len(operation.UnresolvedDepends) != 0 {
+			if !force {
+				log.Fatalf("Error: the following dependencies could not be found in any repositories: %s\n", strings.Join(operation.UnresolvedDepends, ", "))
+			} else {
+				log.Println("Warning: The following dependencies could not be found in any repositories: " + strings.Join(operation.UnresolvedDepends, ", "))
 			}
 		}
 
-		// Show summary
+		// Show operation summary
-		if len(unresolvedDepends) != 0 {
+		operation.ShowOperationSummary()
-			if force {
+
-				log.Fatalf("The following dependencies could not be found in any repositories: %s\n", strings.Join(unresolvedDepends, ", "))
+		// Confirmation Prompt
-			} else {
-				log.Println("Warning: The following dependencies could not be found in any repositories: " + strings.Join(unresolvedDepends, ", "))
-			}
-		}
-		if pkgsToInstall.Len()+pkgsToFetch.Len() == 0 {
-			fmt.Println("All packages are up to date!")
-			os.Exit(0)
-		}
-		for _, pkg := range pkgsToInstall.Keys() {
-			pkgInfo, err := utils.ReadPackage(pkg)
-			if err != nil {
-				if err != nil {
-					log.Fatalf("Could not read package. Error: %s\n", err)
-				}
-			}
-			installedInfo := utils.GetPackageInfo(pkgInfo.Name, rootDir, false)
-			if installedInfo == nil {
-				fmt.Printf("%s: %s (Install)\n", pkgInfo.Name, pkgInfo.Version)
-			} else if strings.Compare(pkgInfo.Version, installedInfo.Version) < 0 {
-				fmt.Printf("%s: %s -> %s (Downgrade)\n", pkgInfo.Name, installedInfo.Version, pkgInfo.Version)
-			} else if strings.Compare(pkgInfo.Version, installedInfo.Version) > 0 {
-				fmt.Printf("%s: %s -> %s (Upgrade)\n", pkgInfo.Name, installedInfo.Version, pkgInfo.Version)
-			} else {
-				fmt.Printf("%s: %s (Reinstall)\n", pkgInfo.Name, pkgInfo.Version)
-			}
-		}
-		for _, pkg := range pkgsToFetch.Keys() {
-			pkgInfo := pkgsToFetch.GetElement(pkg).Value.pkgInfo
-			installedInfo := utils.GetPackageInfo(pkgInfo.Name, rootDir, false)
-			if installedInfo == nil {
-				fmt.Printf("%s: %s (Install)\n", pkgInfo.Name, pkgInfo.Version)
-			} else if strings.Compare(pkgInfo.Version, installedInfo.Version) < 0 {
-				fmt.Printf("%s: %s -> %s (Downgrade)\n", pkgInfo.Name, installedInfo.Version, pkgInfo.Version)
-			} else if strings.Compare(pkgInfo.Version, installedInfo.Version) > 0 {
-				fmt.Printf("%s: %s -> %s (Upgrade)\n", pkgInfo.Name, installedInfo.Version, pkgInfo.Version)
-			} else {
-				fmt.Printf("%s: %s (Reinstall)\n", pkgInfo.Name, pkgInfo.Version)
-			}
-		}
-		if rootDir != "/" {
-			fmt.Println("Warning: Operating in " + rootDir)
-		}
 		if !yesAll {
 			reader := bufio.NewReader(os.Stdin)
-			fmt.Printf("Do you wish to install these %d packages? [y\\N] ", pkgsToInstall.Len()+pkgsToFetch.Len())
+			if len(operation.Actions) == 1 {
+				fmt.Printf("Do you wish to install this package? [y\\N] ")
+			} else {
+				fmt.Printf("Do you wish to install these %d packages? [y\\N] ", len(operation.Actions))
+			}
+
 			text, _ := reader.ReadString('\n')
 			if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" {
-				fmt.Println("Cancelling...")
+				fmt.Println("Cancelling package installation...")
 				os.Exit(1)
 			}
 		}
 
-		// Fetch packages from repositories
+		// Execute operation
-		fmt.Println("Fetching packages from available repositories...")
+		err = operation.Execute(verbose, force)
-		for _, pkg := range pkgsToFetch.Keys() {
-			isDependency, _ := pkgsToFetch.Get(pkg)
-			entry, repo, err := utils.GetRepositoryEntry(pkg)
 		if err != nil {
-				log.Fatalf("Could not find package (%s) in any repository\n", pkg)
+			log.Fatalf("Error: could not complete operation: %s\n", err)
-			}
-			fetchedPackage, err := repo.FetchPackage(entry.Info.Name)
-			if err != nil {
-				log.Fatalf("Could not fetch package (%s). Error: %s\n", pkg, err)
-			}
-			pkgsToInstall.Set(fetchedPackage, isDependency)
-		}
-
-		// Install fetched packages
-		for _, pkg := range pkgsToInstall.Keys() {
-			value, _ := pkgsToInstall.Get(pkg)
-			pkgInfo := value.pkgInfo
-			var err error
-			if value.isDependency {
-				err = utils.InstallPackage(pkg, rootDir, verbose, true, buildSource, skipCheck, keepTempDir)
-			} else {
-				err = utils.InstallPackage(pkg, rootDir, verbose, force, buildSource, skipCheck, keepTempDir)
-			}
-
-			if err != nil {
-				if pkgInfo.Type == "source" && keepTempDir {
-					fmt.Println("BPM temp directory was created at /var/tmp/bpm_source-" + pkgInfo.Name)
-				}
-				log.Fatalf("Could not install package (%s). Error: %s\n", pkg, err)
-			}
-			fmt.Printf("Package (%s) was successfully installed!\n", pkgInfo.Name)
-			if value.isDependency {
-				err := utils.SetInstallationReason(pkgInfo.Name, utils.Dependency, rootDir)
-				if err != nil {
-					log.Fatalf("Could not set installation reason for package\nError: %s\n", err)
-				}
-			}
-			if pkgInfo.Type == "source" && keepTempDir {
-				fmt.Println("** It is recommended you delete the temporary bpm folder in /var/tmp **")
-			}
 		}
 	case update:
 		if os.Getuid() != 0 {
-			fmt.Println("This subcommand needs to be run with superuser permissions")
+			log.Fatalf("Error: this subcommand needs to be run with superuser permissions")
-			os.Exit(0)
 		}
 
 		// Sync repositories
@@ -375,7 +257,7 @@ func resolveCommand() {
 				fmt.Printf("Fetching package database for repository (%s)...\n", repo.Name)
 				err := repo.SyncLocalDatabase()
 				if err != nil {
-					log.Fatal(err)
+					log.Fatalf("Error: could not sync local database for repository (%s): %s\n", repo.Name, err)
 				}
 			}
 			fmt.Println("All package databases synced successfully!")
@@ -386,197 +268,131 @@ func resolveCommand() {
 		// Get installed packages and check for updates
 		pkgs, err := utils.GetInstalledPackages(rootDir)
 		if err != nil {
-			log.Fatalf("Could not get installed packages! Error: %s\n", err)
+			log.Fatalf("Error: could not get installed packages: %s\n", err)
 		}
-		toUpdate := orderedmap.NewOrderedMap[string, *struct {
+
-			isDependency bool
+		operation := utils.BPMOperation{
-			entry        *utils.RepositoryEntry
+			Actions:           make([]utils.OperationAction, 0),
-		}]()
+			UnresolvedDepends: make([]string, 0),
+			RootDir:           rootDir,
+		}
+
+		// Search for packages
 		for _, pkg := range pkgs {
 			entry, _, err := utils.GetRepositoryEntry(pkg)
 			if err != nil {
 				continue
 			}
-			installedInfo := utils.GetPackageInfo(pkg, rootDir, true)
+			installedInfo := utils.GetPackageInfo(pkg, rootDir)
 			if installedInfo == nil {
-				log.Fatalf(pkg)
+				log.Fatalf("Error: could not get package info for (%s)\n", pkg)
-			}
+			} else {
-			if strings.Compare(entry.Info.Version, installedInfo.Version) > 0 {
+				comparison := utils.ComparePackageVersions(*entry.Info, *installedInfo)
-				toUpdate.Set(entry.Info.Name, &struct {
+				if comparison > 0 || reinstall {
-					isDependency bool
+					operation.Actions = append(operation.Actions, &utils.FetchPackageAction{
-					entry        *utils.RepositoryEntry
+						IsDependency:    false,
-				}{isDependency: false, entry: entry})
+						RepositoryEntry: entry,
-			} else if reinstall {
+					})
-				toUpdate.Set(entry.Info.Name, &struct {
-					isDependency bool
-					entry        *utils.RepositoryEntry
-				}{isDependency: false, entry: entry})
 				}
 			}
-		if toUpdate.Len() == 0 {
-			fmt.Println("All packages are up to date!")
-			os.Exit(0)
 		}
 
 		// Check for new dependencies in updated packages
-		unresolved := make([]string, 0)
+		err = operation.ResolveDependencies(reinstallAll, !noOptional, verbose)
-		clone := toUpdate.Copy()
-		for _, key := range clone.Keys() {
-			pkg, _ := clone.Get(key)
-			r, u := pkg.entry.Info.ResolveAll(&[]string{}, &[]string{}, false, !noOptional, true, rootDir)
-			unresolved = append(unresolved, u...)
-			for _, depend := range r {
-				if _, ok := toUpdate.Get(depend); !ok {
-					entry, _, err := utils.GetRepositoryEntry(depend)
 		if err != nil {
-						log.Fatalf("Could not find package (%s) in any repository\n", depend)
+			log.Fatalf("Error: could not resolve dependencies: %s\n", err)
 		}
-					toUpdate.Set(depend, &struct {
+		if len(operation.UnresolvedDepends) != 0 {
-						isDependency bool
+			if !force {
-						entry        *utils.RepositoryEntry
+				log.Fatalf("Error: the following dependencies could not be found in any repositories: %s\n", strings.Join(operation.UnresolvedDepends, ", "))
-					}{isDependency: true, entry: entry})
-				}
-			}
-		}
-
-		if len(unresolved) != 0 {
-			if force {
-				log.Fatalf("The following dependencies could not be found in any repositories: %s\n", strings.Join(unresolved, ", "))
 			} else {
-				log.Println("Warning: The following dependencies could not be found in any repositories: " + strings.Join(unresolved, ", "))
+				log.Println("Warning: The following dependencies could not be found in any repositories: " + strings.Join(operation.UnresolvedDepends, ", "))
 			}
 		}
 
-		for _, key := range toUpdate.Keys() {
+		// Show operation summary
-			value, _ := toUpdate.Get(key)
+		operation.ShowOperationSummary()
-			installedInfo := utils.GetPackageInfo(value.entry.Info.Name, rootDir, true)
-			if installedInfo == nil {
-				fmt.Printf("%s: %s (Install)\n", value.entry.Info.Name, value.entry.Info.Version)
-				continue
-			}
-			if strings.Compare(value.entry.Info.Version, installedInfo.Version) > 0 {
-				fmt.Printf("%s: %s -> %s (Upgrade)\n", value.entry.Info.Name, installedInfo.Version, value.entry.Info.Version)
-			} else if reinstall {
-				fmt.Printf("%s: %s -> %s (Reinstall)\n", value.entry.Info.Name, installedInfo.Version, value.entry.Info.Version)
-			}
-		}
 
-		// Update confirmation prompt
+		// Confirmation Prompt
 		if !yesAll {
-			fmt.Printf("Are you sure you wish to update all %d packages? [y\\N] ", toUpdate.Len())
+			fmt.Printf("Are you sure you wish to update all %d packages? [y\\N] ", len(operation.Actions))
 			reader := bufio.NewReader(os.Stdin)
 			text, _ := reader.ReadString('\n')
 			if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" {
-				fmt.Println("Cancelling update...")
+				fmt.Println("Cancelling package update...")
-				os.Exit(0)
+				os.Exit(1)
 			}
 		}
 
-		// Fetch packages
+		// Execute operation
-		pkgsToInstall := orderedmap.NewOrderedMap[string, *struct {
+		err = operation.Execute(verbose, force)
-			isDependency bool
-			entry        *utils.RepositoryEntry
-		}]()
-		fmt.Println("Fetching packages from available repositories...")
-		for _, pkg := range toUpdate.Keys() {
-			isDependency, _ := toUpdate.Get(pkg)
-			entry, repo, err := utils.GetRepositoryEntry(pkg)
 		if err != nil {
-				log.Fatalf("Could not find package (%s) in any repository\n", pkg)
+			log.Fatalf("Error: could not complete operation: %s\n", err)
-			}
-			fetchedPackage, err := repo.FetchPackage(entry.Info.Name)
-			if err != nil {
-				log.Fatalf("Could not fetch package (%s). Error: %s\n", pkg, err)
-			}
-			pkgsToInstall.Set(fetchedPackage, isDependency)
-		}
-
-		// Install fetched packages
-		for _, pkg := range pkgsToInstall.Keys() {
-			value, _ := pkgsToInstall.Get(pkg)
-			pkgInfo := value.entry.Info
-			var err error
-			if value.isDependency {
-				err = utils.InstallPackage(pkg, rootDir, verbose, true, buildSource, skipCheck, keepTempDir)
-			} else {
-				err = utils.InstallPackage(pkg, rootDir, verbose, force, buildSource, skipCheck, keepTempDir)
-			}
-
-			if err != nil {
-				if pkgInfo.Type == "source" && keepTempDir {
-					fmt.Println("BPM temp directory was created at /var/tmp/bpm_source-" + pkgInfo.Name)
-				}
-				log.Fatalf("Could not install package (%s). Error: %s\n", pkg, err)
-			}
-			fmt.Printf("Package (%s) was successfully installed!\n", pkgInfo.Name)
-			if value.isDependency {
-				err := utils.SetInstallationReason(pkgInfo.Name, utils.Dependency, rootDir)
-				if err != nil {
-					log.Fatalf("Could not set installation reason for package\nError: %s\n", err)
-				}
-			}
-			if pkgInfo.Type == "source" && keepTempDir {
-				fmt.Println("** It is recommended you delete the temporary bpm folder in /var/tmp **")
-			}
 		}
 	case sync:
 		if os.Getuid() != 0 {
-			fmt.Println("This subcommand needs to be run with superuser permissions")
+			log.Fatalf("Error: this subcommand needs to be run with superuser permissions")
-			os.Exit(0)
 		}
 		if !yesAll {
 			fmt.Printf("Are you sure you wish to sync all databases? [y\\N] ")
 			reader := bufio.NewReader(os.Stdin)
 			text, _ := reader.ReadString('\n')
 			if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" {
-				fmt.Println("Cancelling sync...")
+				fmt.Println("Cancelling database synchronization...")
-				os.Exit(0)
+				os.Exit(1)
 			}
 		}
 		for _, repo := range utils.BPMConfig.Repositories {
 			fmt.Printf("Fetching package database for repository (%s)...\n", repo.Name)
 			err := repo.SyncLocalDatabase()
 			if err != nil {
-				log.Fatal(err)
+				log.Fatalf("Error: could not sync local database for repository (%s): %s\n", repo.Name, err)
 			}
 		}
 		fmt.Println("All package databases synced successfully!")
 	case remove:
 		if os.Getuid() != 0 {
-			fmt.Println("This subcommand needs to be run with superuser permissions")
+			log.Fatalf("Error: this subcommand needs to be run with superuser permissions")
-			os.Exit(0)
 		}
 		packages := subcommandArgs
 		if len(packages) == 0 {
 			fmt.Println("No packages were given")
 			return
 		}
+
+		operation := &utils.BPMOperation{
+			Actions:           make([]utils.OperationAction, 0),
+			UnresolvedDepends: make([]string, 0),
+			RootDir:           rootDir,
+		}
+
+		// Search for packages
 		for _, pkg := range packages {
-			pkgInfo := utils.GetPackageInfo(pkg, rootDir, false)
+			bpmpkg := utils.GetPackage(pkg, rootDir)
-			if pkgInfo == nil {
+			if bpmpkg == nil {
-				fmt.Printf("Package (%s) could not be found\n", pkg)
+				log.Fatalf("Error: package (%s) could not be found\n", pkg)
-				continue
 			}
-			fmt.Println("----------------\n" + utils.CreateReadableInfo(false, false, false, pkgInfo, rootDir))
+			operation.Actions = append(operation.Actions, &utils.RemovePackageAction{BpmPackage: bpmpkg})
-			fmt.Println("----------------")
-			if rootDir != "/" {
-				fmt.Println("Warning: Operating in " + rootDir)
 		}
+
+		// Show operation summary
+		operation.ShowOperationSummary()
+
+		// Confirmation Prompt
 		if !yesAll {
+			fmt.Printf("Are you sure you wish to remove all %d packages? [y\\N] ", len(operation.Actions))
 			reader := bufio.NewReader(os.Stdin)
-				fmt.Print("Do you wish to remove this package? [y\\N] ")
 			text, _ := reader.ReadString('\n')
 			if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" {
-					fmt.Printf("Skipping package (%s)...\n", pkgInfo.Name)
+				fmt.Println("Cancelling package removal...")
-					continue
+				os.Exit(1)
 			}
 		}
-			err := utils.RemovePackage(pkg, verbose, rootDir)
 
+		// Execute operation
+		err := operation.Execute(verbose, force)
 		if err != nil {
-				log.Fatalf("Could not remove package\nError: %s\n", err)
+			log.Fatalf("Error: could not complete operation: %s\n", err)
-			}
-			fmt.Printf("Package (%s) was successfully removed!\n", pkgInfo.Name)
 		}
 	case file:
 		files := subcommandArgs
@@ -587,23 +403,23 @@ func resolveCommand() {
 		for _, file := range files {
 			absFile, err := filepath.Abs(file)
 			if err != nil {
-				log.Fatalf("Could not get absolute path of %s", file)
+				log.Fatalf("Error: could not get absolute path of file (%s)\n", file)
 			}
 			stat, err := os.Stat(absFile)
 			if os.IsNotExist(err) {
-				log.Fatalf(absFile + " does not exist!")
+				log.Fatalf("Error: file (%s) does not exist!\n", absFile)
 			}
 			pkgs, err := utils.GetInstalledPackages(rootDir)
 			if err != nil {
-				log.Fatalf("Could not get installed packages. Error %s", err.Error())
+				log.Fatalf("Error: could not get installed packages: %s\n", err.Error())
 			}
 
 			if !strings.HasPrefix(absFile, rootDir) {
-				log.Fatalf("Could not get relative path of %s to root path", absFile)
+				log.Fatalf("Error: could not get path of file (%s) relative to root path", absFile)
 			}
 			absFile, err = filepath.Rel(rootDir, absFile)
 			if err != nil {
-				log.Fatalf("Could not get relative path of %s to root path", absFile)
+				log.Fatalf("Error: could not get path of file (%s) relative to root path", absFile)
 			}
 			absFile = strings.TrimPrefix(absFile, "/")
 			if stat.IsDir() {
@@ -612,7 +428,9 @@ func resolveCommand() {
 
 			var pkgList []string
 			for _, pkg := range pkgs {
-				if slices.Contains(utils.GetPackageFiles(pkg, rootDir), absFile) {
+				if slices.ContainsFunc(utils.GetPackageFiles(pkg, rootDir), func(entry *utils.PackageFileEntry) bool {
+					return entry.Path == absFile
+				}) {
 					pkgList = append(pkgList, pkg)
 				}
 			}

utils/extract_utils.go

@@ -0,0 +1,43 @@
+package utils
+
+import (
+	"archive/tar"
+	"errors"
+	"io"
+	"os"
+)
+
+type TarballFileReader struct {
+	tarReader *tar.Reader
+	file      *os.File
+}
+
+func ReadTarballContent(tarballPath, fileToExtract string) (*TarballFileReader, error) {
+	file, err := os.Open(tarballPath)
+	if err != nil {
+		return nil, err
+	}
+
+	tr := tar.NewReader(file)
+	for {
+		header, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+		if header.Name == fileToExtract {
+			if header.Typeflag != tar.TypeReg {
+				return nil, errors.New("file to extract must be a regular file")
+			}
+
+			return &TarballFileReader{
+				tarReader: tr,
+				file:      file,
+			}, nil
+		}
+	}
+
+	return nil, errors.New("could not file in tarball")
+}

utils/general_utils.go

@@ -1,18 +1,26 @@
 package utils
 
 import (
+	"fmt"
 	"io"
+	"math"
 	"os"
-	"os/exec"
+	"syscall"
-	"strings"
 )
 
 func GetArch() string {
-	output, err := exec.Command("/usr/bin/uname", "-m").Output()
+	uname := syscall.Utsname{}
+	err := syscall.Uname(&uname)
 	if err != nil {
 		return ""
 	}
-	return strings.TrimSpace(string(output))
+
+	var byteString [65]byte
+	var indexLength int
+	for ; uname.Machine[indexLength] != 0; indexLength++ {
+		byteString[indexLength] = uint8(uname.Machine[indexLength])
+	}
+	return string(byteString[:indexLength])
 }
 
 func copyFileContents(src, dst string) (err error) {
@@ -47,12 +55,24 @@ func stringSliceRemove(s []string, r string) []string {
 	return s
 }
 
-func stringSliceRemoveEmpty(s []string) []string {
+func UnsignedBytesToHumanReadable(b uint64) string {
-	var r []string
+	bf := float64(b)
-	for _, str := range s {
+	for _, unit := range []string{"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"} {
-		if str != "" {
+		if math.Abs(bf) < 1024.0 {
-			r = append(r, str)
+			return fmt.Sprintf("%3.1f%sB", bf, unit)
 		}
+		bf /= 1024.0
 	}
-	return r
+	return fmt.Sprintf("%.1fYiB", bf)
+}
+
+func BytesToHumanReadable(b int64) string {
+	bf := float64(b)
+	for _, unit := range []string{"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"} {
+		if math.Abs(bf) < 1024.0 {
+			return fmt.Sprintf("%3.1f%sB", bf, unit)
+		}
+		bf /= 1024.0
+	}
+	return fmt.Sprintf("%.1fYiB", bf)
 }

utils/operations.go

@@ -0,0 +1,289 @@
+package utils
+
+import (
+	"errors"
+	"fmt"
+	"log"
+	"os"
+	"slices"
+	"strings"
+)
+
+type BPMOperation struct {
+	Actions           []OperationAction
+	UnresolvedDepends []string
+	RootDir           string
+}
+
+func (operation *BPMOperation) ActionsContainPackage(pkg string) bool {
+	for _, action := range operation.Actions {
+		if action.GetActionType() == "install" {
+			if action.(*InstallPackageAction).BpmPackage.PkgInfo.Name == pkg {
+				return true
+			}
+		} else if action.GetActionType() == "fetch" {
+			if action.(*FetchPackageAction).RepositoryEntry.Info.Name == pkg {
+				return true
+			}
+		} else if action.GetActionType() == "remove" {
+			if action.(*RemovePackageAction).BpmPackage.PkgInfo.Name == pkg {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func (operation *BPMOperation) InsertActionAt(index int, action OperationAction) {
+	if len(operation.Actions) == index { // nil or empty slice or after last element
+		operation.Actions = append(operation.Actions, action)
+	}
+	operation.Actions = append(operation.Actions[:index+1], operation.Actions[index:]...) // index < len(a)
+	operation.Actions[index] = action
+}
+
+func (operation *BPMOperation) GetTotalDownloadSize() uint64 {
+	var ret uint64 = 0
+	for _, action := range operation.Actions {
+		if action.GetActionType() == "fetch" {
+			ret += action.(*FetchPackageAction).RepositoryEntry.DownloadSize
+		}
+	}
+	return ret
+}
+
+func (operation *BPMOperation) GetTotalInstalledSize() uint64 {
+	var ret uint64 = 0
+	for _, action := range operation.Actions {
+		if action.GetActionType() == "install" {
+			ret += action.(*InstallPackageAction).BpmPackage.GetInstalledSize()
+		} else if action.GetActionType() == "fetch" {
+			ret += action.(*FetchPackageAction).RepositoryEntry.InstalledSize
+		}
+	}
+	return ret
+}
+
+func (operation *BPMOperation) GetFinalActionSize(rootDir string) int64 {
+	var ret int64 = 0
+	for _, action := range operation.Actions {
+		if action.GetActionType() == "install" {
+			ret += int64(action.(*InstallPackageAction).BpmPackage.GetInstalledSize())
+			if IsPackageInstalled(action.(*InstallPackageAction).BpmPackage.PkgInfo.Name, rootDir) {
+				ret -= int64(GetPackage(action.(*InstallPackageAction).BpmPackage.PkgInfo.Name, rootDir).GetInstalledSize())
+			}
+		} else if action.GetActionType() == "fetch" {
+			ret += int64(action.(*FetchPackageAction).RepositoryEntry.InstalledSize)
+		} else if action.GetActionType() == "remove" {
+			ret -= int64(action.(*RemovePackageAction).BpmPackage.GetInstalledSize())
+		}
+	}
+	return ret
+}
+
+func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, installOptionalDependencies, verbose bool) error {
+	pos := 0
+	for _, value := range slices.Clone(operation.Actions) {
+		var pkgInfo *PackageInfo
+		if value.GetActionType() == "install" {
+			action := value.(*InstallPackageAction)
+			pkgInfo = action.BpmPackage.PkgInfo
+		} else if value.GetActionType() == "fetch" {
+			action := value.(*FetchPackageAction)
+			pkgInfo = action.RepositoryEntry.Info
+		} else {
+			pos++
+			continue
+		}
+
+		resolved, unresolved := pkgInfo.ResolveDependencies(&[]string{}, &[]string{}, pkgInfo.Type == "source", installOptionalDependencies, !reinstallDependencies, verbose, operation.RootDir)
+
+		operation.UnresolvedDepends = append(operation.UnresolvedDepends, unresolved...)
+
+		for _, depend := range resolved {
+			if !operation.ActionsContainPackage(depend) && depend != pkgInfo.Name {
+				if !reinstallDependencies && IsPackageInstalled(depend, operation.RootDir) {
+					continue
+				}
+				entry, _, err := GetRepositoryEntry(depend)
+				if err != nil {
+					return errors.New("could not get repository entry for package (" + depend + ")")
+				}
+				operation.InsertActionAt(pos, &FetchPackageAction{
+					IsDependency:    true,
+					RepositoryEntry: entry,
+				})
+				pos++
+			}
+		}
+		pos++
+	}
+
+	return nil
+}
+
+func (operation *BPMOperation) ShowOperationSummary() {
+	if len(operation.Actions) == 0 {
+		fmt.Println("All packages are up to date!")
+		os.Exit(0)
+	}
+
+	for _, value := range operation.Actions {
+		var pkgInfo *PackageInfo
+		if value.GetActionType() == "install" {
+			pkgInfo = value.(*InstallPackageAction).BpmPackage.PkgInfo
+		} else if value.GetActionType() == "fetch" {
+			pkgInfo = value.(*FetchPackageAction).RepositoryEntry.Info
+		} else {
+			pkgInfo = value.(*RemovePackageAction).BpmPackage.PkgInfo
+			fmt.Printf("%s: %s (Remove)\n", pkgInfo.Name, pkgInfo.GetFullVersion())
+			continue
+		}
+
+		installedInfo := GetPackageInfo(pkgInfo.Name, operation.RootDir)
+		sourceInfo := ""
+		if pkgInfo.Type == "source" {
+			if operation.RootDir != "/" {
+				log.Fatalf("cannot compile and install source packages to a different root directory")
+			}
+			sourceInfo = "(From Source)"
+		}
+
+		if installedInfo == nil {
+			fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo)
+		} else {
+			comparison := ComparePackageVersions(*pkgInfo, *installedInfo)
+			if comparison < 0 {
+				fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo)
+			} 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 operation.RootDir != "/" {
+		fmt.Println("Warning: Operating in " + operation.RootDir)
+	}
+	if operation.GetTotalDownloadSize() > 0 {
+		fmt.Printf("%s will be downloaded to complete this operation\n", UnsignedBytesToHumanReadable(operation.GetTotalDownloadSize()))
+	}
+	if operation.GetFinalActionSize(operation.RootDir) > 0 {
+		fmt.Printf("A total of %s will be installed after the operation finishes\n", BytesToHumanReadable(operation.GetFinalActionSize(operation.RootDir)))
+	} else if operation.GetFinalActionSize(operation.RootDir) < 0 {
+		fmt.Printf("A total of %s will be freed after the operation finishes\n", strings.TrimPrefix(BytesToHumanReadable(operation.GetFinalActionSize(operation.RootDir)), "-"))
+	}
+}
+
+func (operation *BPMOperation) Execute(verbose, force bool) error {
+	// Fetch packages from repositories
+	if slices.ContainsFunc(operation.Actions, func(action OperationAction) bool {
+		return action.GetActionType() == "fetch"
+	}) {
+		fmt.Println("Fetching packages from available repositories...")
+		for i, action := range operation.Actions {
+			if action.GetActionType() != "fetch" {
+				continue
+			}
+			entry := action.(*FetchPackageAction).RepositoryEntry
+			fetchedPackage, err := entry.Repository.FetchPackage(entry.Info.Name)
+			if err != nil {
+				return errors.New(fmt.Sprintf("could not fetch package (%s): %s\n", entry.Info.Name, err))
+			}
+			bpmpkg, err := ReadPackage(fetchedPackage)
+			if err != nil {
+				return errors.New(fmt.Sprintf("could not fetch package (%s): %s\n", entry.Info.Name, err))
+			}
+			fmt.Printf("Package (%s) was successfully fetched!\n", bpmpkg.PkgInfo.Name)
+			operation.Actions[i] = &InstallPackageAction{
+				File:         fetchedPackage,
+				IsDependency: action.(*FetchPackageAction).IsDependency,
+				BpmPackage:   bpmpkg,
+			}
+		}
+	}
+
+	// Determine words to be used for the following message
+	words := make([]string, 0)
+	if slices.ContainsFunc(operation.Actions, func(action OperationAction) bool {
+		return action.GetActionType() == "install"
+	}) {
+		words = append(words, "Installing")
+	}
+
+	if slices.ContainsFunc(operation.Actions, func(action OperationAction) bool {
+		return action.GetActionType() == "remove"
+	}) {
+		words = append(words, "Removing")
+	}
+
+	if len(words) == 0 {
+		return nil
+	}
+	fmt.Printf("%s packages...\n", strings.Join(words, "/"))
+
+	// Installing/Removing packages from system
+	for _, action := range operation.Actions {
+		if action.GetActionType() == "remove" {
+			pkgInfo := action.(*RemovePackageAction).BpmPackage.PkgInfo
+			err := RemovePackage(pkgInfo.Name, verbose, operation.RootDir)
+			if err != nil {
+				return errors.New(fmt.Sprintf("could not remove package (%s): %s\n", pkgInfo.Name, err))
+			}
+		} else if action.GetActionType() == "install" {
+			value := action.(*InstallPackageAction)
+			bpmpkg := value.BpmPackage
+			var err error
+			if value.IsDependency {
+				err = InstallPackage(value.File, operation.RootDir, verbose, true, false, false, false)
+			} else {
+				err = InstallPackage(value.File, operation.RootDir, verbose, force, false, false, false)
+			}
+			if err != nil {
+				return errors.New(fmt.Sprintf("could not install package (%s): %s\n", bpmpkg.PkgInfo.Name, err))
+			}
+			fmt.Printf("Package (%s) was successfully installed\n", bpmpkg.PkgInfo.Name)
+			if value.IsDependency {
+				err := SetInstallationReason(bpmpkg.PkgInfo.Name, Dependency, operation.RootDir)
+				if err != nil {
+					return errors.New(fmt.Sprintf("could not set installation reason for package (%s): %s\n", value.BpmPackage.PkgInfo.Name, err))
+				}
+			}
+		}
+	}
+	fmt.Println("Operation complete!")
+
+	return nil
+}
+
+type OperationAction interface {
+	GetActionType() string
+}
+
+type InstallPackageAction struct {
+	File         string
+	IsDependency bool
+	BpmPackage   *BPMPackage
+}
+
+func (action *InstallPackageAction) GetActionType() string {
+	return "install"
+}
+
+type FetchPackageAction struct {
+	IsDependency    bool
+	RepositoryEntry *RepositoryEntry
+}
+
+func (action *FetchPackageAction) GetActionType() string {
+	return "fetch"
+}
+
+type RemovePackageAction struct {
+	BpmPackage *BPMPackage
+}
+
+func (action *RemovePackageAction) GetActionType() string {
+	return "remove"
+}

utils/repo_utils.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"os"
 	"path"
+	"sort"
 	"strings"
 )
 
@@ -21,6 +22,10 @@ type Repository struct {
 type RepositoryEntry struct {
 	Info             *PackageInfo `yaml:"info"`
 	Download         string       `yaml:"download"`
+	DownloadSize     uint64       `yaml:"download_size"`
+	InstalledSize    uint64       `yaml:"installed_size"`
+	IsVirtualPackage bool         `yaml:"-"`
+	Repository       *Repository
 }
 
 func (repo *Repository) ContainsPackage(pkg string) bool {
@@ -39,6 +44,8 @@ func (repo *Repository) ReadLocalDatabase() error {
 		return err
 	}
 
+	virtualPackages := make(map[string][]string)
+
 	data := string(bytes)
 	for _, b := range strings.Split(data, "---") {
 		entry := RepositoryEntry{
@@ -46,6 +53,7 @@ func (repo *Repository) ReadLocalDatabase() error {
 				Name:            "",
 				Description:     "",
 				Version:         "",
+				Revision:        1,
 				Url:             "",
 				License:         "",
 				Arch:            "",
@@ -58,13 +66,37 @@ func (repo *Repository) ReadLocalDatabase() error {
 				Provides:        make([]string, 0),
 			},
 			Download:         "",
+			DownloadSize:     0,
+			InstalledSize:    0,
+			IsVirtualPackage: false,
+			Repository:       repo,
 		}
 		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,
+			DownloadSize:     repo.Entries[value[0]].DownloadSize,
+			InstalledSize:    repo.Entries[value[0]].InstalledSize,
+			IsVirtualPackage: true,
+			Repository:       repo,
+		}
+		repo.Entries[key] = &entry
+	}
 	return nil
 }
 
@@ -137,7 +169,7 @@ func GetRepositoryEntry(str string) (*RepositoryEntry, *Repository, error) {
 
 func (repo *Repository) FetchPackage(pkg string) (string, error) {
 	if !repo.ContainsPackage(pkg) {
-		return "", errors.New("Could not fetch package '" + pkg + "'")
+		return "", errors.New("could not fetch package '" + pkg + "'")
 	}
 	entry := repo.Entries[pkg]
 	URL, err := url.JoinPath(repo.Source, entry.Download)