mirror of
https://github.com/EnumeratedDev/bpm.git
synced 2026-09-24 14:36:12 +00:00
Compare commits
5
Commits
6206fdbf43
..
0.6.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f23537ba7d
|
||
|
|
6e9f16837c
|
||
|
|
271e87cb77
|
||
|
|
25ccc208d7
|
||
|
|
9c7e20d27d
|
@@ -13,7 +13,7 @@ ROOT_COMPILATION_GID ?= 65534
|
||||
|
||||
build:
|
||||
mkdir -p build
|
||||
cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config.BpmVersion=$(VERSION)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm
|
||||
cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'main.BpmVersion=$(VERSION)' -X 'github.com/EnumeratedDev/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'github.com/EnumeratedDev/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm bpm
|
||||
|
||||
install: build/bpm config/
|
||||
# Create directory
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
package config
|
||||
|
||||
var BpmVersion = "dev"
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
module git.enumerated.dev/bubble-package-manager/bpm/src/bpm
|
||||
module bpm
|
||||
|
||||
go 1.24.0
|
||||
|
||||
require (
|
||||
git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib v0.5.0
|
||||
github.com/EnumeratedDev/bpm/src/bpmlib v0.0.0
|
||||
github.com/lithammer/fuzzysearch v1.1.8
|
||||
github.com/spf13/pflag v1.0.10
|
||||
)
|
||||
|
||||
replace git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib => ../bpmlib
|
||||
replace github.com/EnumeratedDev/bpm/src/bpmlib => ../bpmlib
|
||||
|
||||
require (
|
||||
github.com/drone/envsubst v1.0.3 // indirect
|
||||
|
||||
+8
-5
@@ -14,8 +14,7 @@ import (
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config"
|
||||
"git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib"
|
||||
"github.com/EnumeratedDev/bpm/src/bpmlib"
|
||||
|
||||
"github.com/lithammer/fuzzysearch/fuzzy"
|
||||
flag "github.com/spf13/pflag"
|
||||
@@ -26,6 +25,8 @@ import (
|
||||
/* A simple-to-use package manager */
|
||||
/* ------------------------------------------------------- */
|
||||
|
||||
var BpmVersion = "dev"
|
||||
|
||||
var currentFlagSet *flag.FlagSet
|
||||
|
||||
var exitCode = 0
|
||||
@@ -47,7 +48,7 @@ func main() {
|
||||
switch subcommand {
|
||||
case "v", "version":
|
||||
fmt.Println("Bubble Package Manager (BPM)")
|
||||
fmt.Println("Version: " + config.BpmVersion)
|
||||
fmt.Println("Version: " + BpmVersion)
|
||||
case "q", "query":
|
||||
// Setup flags and help
|
||||
currentFlagSet = flag.NewFlagSet("query", flag.ExitOnError)
|
||||
@@ -626,7 +627,7 @@ func installPackages() {
|
||||
// Show optional dependencies
|
||||
if !installOptional && len(optionalDepends) != 0 {
|
||||
// List optional dependencies
|
||||
fmt.Println("The following opitonal dependenices have been discovered:")
|
||||
fmt.Println("The following optional dependenices have been discovered:")
|
||||
for dependant, depends := range optionalDepends {
|
||||
fmt.Printf("%s: \n", dependant)
|
||||
for _, depend := range depends {
|
||||
@@ -1018,7 +1019,7 @@ func updatePackages() {
|
||||
// Show optional dependencies
|
||||
if !installOptional && len(optionalDepends) != 0 {
|
||||
// List optional dependencies
|
||||
fmt.Println("The following opitonal dependenices have been discovered:")
|
||||
fmt.Println("The following optional dependenices have been discovered:")
|
||||
for dependant, depends := range optionalDepends {
|
||||
fmt.Printf("%s: \n", dependant)
|
||||
for _, depend := range depends {
|
||||
@@ -1102,6 +1103,8 @@ func getFileOwner() {
|
||||
// Print packages
|
||||
if len(pkgList) == 0 {
|
||||
fmt.Printf("%s (%s) is not owned by any packages!\n", absPath, pathType)
|
||||
exitCode = 1
|
||||
return
|
||||
} else {
|
||||
fmt.Printf("%s (%s) is owned by the following packages:\n", absPath, pathType)
|
||||
for _, pkg := range pkgList {
|
||||
|
||||
@@ -63,11 +63,12 @@ func (db *configDatabase) ReadLocalDatabase() error {
|
||||
database.Name = db.Name
|
||||
database.Source = db.Source
|
||||
|
||||
entriesToRemove := make([]string, 0)
|
||||
for entryName, entry := range database.Entries {
|
||||
entry.Database = database
|
||||
|
||||
if entry.Info.IsSplitPackage() {
|
||||
delete(database.Entries, entryName)
|
||||
|
||||
// Handle split packages
|
||||
for _, splitPkg := range entry.Info.SplitPackages {
|
||||
// Turn split package into json data
|
||||
@@ -106,9 +107,6 @@ func (db *configDatabase) ReadLocalDatabase() error {
|
||||
for _, p := range splitPkg.Provides {
|
||||
database.VirtualPackages[p] = append(database.VirtualPackages[p], splitPkg.Name)
|
||||
}
|
||||
|
||||
// Add current entry to list for removal
|
||||
entriesToRemove = append(entriesToRemove, entryName)
|
||||
}
|
||||
} else {
|
||||
// Add virtual packages to database
|
||||
@@ -118,11 +116,6 @@ func (db *configDatabase) ReadLocalDatabase() error {
|
||||
}
|
||||
}
|
||||
|
||||
// Remove entries
|
||||
for _, entryName := range entriesToRemove {
|
||||
delete(database.Entries, entryName)
|
||||
}
|
||||
|
||||
BPMDatabases[db.Name] = database
|
||||
|
||||
return nil
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
module git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib
|
||||
module github.com/EnumeratedDev/bpm/src/bpmlib
|
||||
|
||||
go 1.24.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user