From e8d5f0a565f93cbe5a1c6ed061fa59195652aa5e Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 22 Apr 2025 17:00:20 +0300 Subject: [PATCH 01/33] Add basic compilation functionality --- src/bpm/main.go | 49 ++++++++++ src/bpmlib/compilation.go | 185 ++++++++++++++++++++++++++++++++++++++ src/bpmlib/tarball.go | 64 +++++++++++++ 3 files changed, 298 insertions(+) create mode 100644 src/bpmlib/compilation.go diff --git a/src/bpm/main.go b/src/bpm/main.go index 9ff4a10..f3c807b 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -8,6 +8,7 @@ import ( "git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib" "log" "os" + "path" "path/filepath" "slices" "strings" @@ -62,6 +63,7 @@ const ( remove cleanup file + compile ) func getCommandType() commandType { @@ -86,6 +88,8 @@ func getCommandType() commandType { return cleanup case "file": return file + case "compile": + return compile default: return help } @@ -543,6 +547,51 @@ func resolveCommand() { } } } + case compile: + if len(subcommandArgs) == 0 { + fmt.Println("No source packages were given") + return + } + + // Read local databases + err := bpmlib.ReadLocalDatabases() + if err != nil { + log.Fatalf("Error: could not read local databases: %s", err) + } + + // Compile packages + for _, sourcePackage := range subcommandArgs { + if _, err := os.Stat(sourcePackage); os.IsNotExist(err) { + log.Fatalf("Error: file (%s) does not exist!", sourcePackage) + } + + // Read archive + bpmpkg, err := bpmlib.ReadPackage(sourcePackage) + if err != nil { + log.Fatalf("Could not read package (%s): %s", sourcePackage, err) + } + + // Ensure archive is source BPM package + if bpmpkg.PkgInfo.Type != "source" { + log.Fatalf("Error: cannot compile a non-source package!") + } + + // Get current working directory + workdir, err := os.Getwd() + if err != nil { + log.Fatalf("Error: could not get working directory: %s", err) + } + + outputFilename := fmt.Sprintf(path.Join(workdir, "%s-%s-%d.bpm"), bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision) + + err = bpmlib.CompileSourcePackage(sourcePackage, outputFilename) + if err != nil { + log.Fatalf("Error: could not compile source package (%s): %s", sourcePackage, err) + } + + fmt.Printf("Package (%s) was successfully compiled! Binary package generated at: %s\n", sourcePackage, outputFilename) + } + default: printHelp() } diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go new file mode 100644 index 0000000..be677e4 --- /dev/null +++ b/src/bpmlib/compilation.go @@ -0,0 +1,185 @@ +package bpmlib + +import ( + "errors" + "fmt" + "gopkg.in/yaml.v3" + "io" + "os" + "os/exec" + "path" + "strconv" +) + +func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { + // Read BPM archive + bpmpkg, err := ReadPackage(archiveFilename) + if err != nil { + return err + } + + // Ensure package type is 'source' + if bpmpkg.PkgInfo.Type != "source" { + return errors.New("cannot compile a non-source package") + } + + // Get HOME directory + homeDir, err := os.UserHomeDir() + if err != nil { + return err + } + + tempDirectory := path.Join(homeDir, ".cache/bpm/compilation/", bpmpkg.PkgInfo.Name) + + // Ensure temporary directory does not exist + if _, err := os.Stat(tempDirectory); err == nil { + err := os.RemoveAll(tempDirectory) + if err != nil { + return err + } + } + + // Create temporary directory + err = os.MkdirAll(tempDirectory, 0755) + if err != nil { + return err + } + + // Extract source.sh file + content, err := readTarballContent(archiveFilename, "source.sh") + if err != nil { + return err + } + sourceFile, err := os.Create(path.Join(tempDirectory, "source.sh")) + if err != nil { + return err + } + _, err = io.Copy(sourceFile, content.tarReader) + if err != nil { + return err + } + err = sourceFile.Close() + if err != nil { + return err + } + err = content.file.Close() + if err != nil { + return err + } + + // Extract source files + err = extractTarballDirectory(archiveFilename, "source-files", tempDirectory) + if err != nil { + return err + } + + // Create source directory + err = os.Mkdir(path.Join(tempDirectory, "source"), 0755) + if err != nil { + return err + } + + // Setup environment for commands + env := os.Environ() + env = append(env, "HOME="+tempDirectory) + env = append(env, "BPM_WORKDIR="+tempDirectory) + env = append(env, "BPM_SOURCE="+path.Join(tempDirectory, "source")) + env = append(env, "BPM_OUTPUT="+path.Join(tempDirectory, "output")) + env = append(env, "BPM_PKG_NAME="+bpmpkg.PkgInfo.Name) + env = append(env, "BPM_PKG_VERSION="+bpmpkg.PkgInfo.Version) + env = append(env, "BPM_PKG_REVISION="+strconv.Itoa(bpmpkg.PkgInfo.Revision)) + env = append(env, "BPM_PKG_ARCH="+GetArch()) + + // Execute prepare and build functions in source.sh script + cmd := exec.Command("bash", "-c", + "set -a\n"+ // Source and export functions and variables in source.sh script + ". \"${BPM_WORKDIR}\"/source.sh\n"+ + "set +a\n"+ + "[[ $(type -t prepare) == \"function\" ]] && (echo \"Running prepare() function\" && cd \"$BPM_SOURCE\" && set -e && prepare)\n"+ // Run prepare() function if it exists + "[[ $(type -t build) == \"function\" ]] && (echo \"Running build() function\" && cd \"$BPM_SOURCE\" && set -e && build)\n"+ // Run build() function if it exists + "[[ $(type -t check) == \"function\" ]] && (echo \"Running check() function\" && cd \"$BPM_SOURCE\" && set -e && check)\n"+ // Run check() function if it exists + "exit 0") + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + err = cmd.Run() + if err != nil { + return err + } + + // Remove 'output' directory if it already exists + if _, err := os.Stat(path.Join(tempDirectory, "output")); err == nil { + err := os.RemoveAll(path.Join(tempDirectory, "output")) + if err != nil { + return err + } + } + + // Create new 'output' directory + err = os.Mkdir(path.Join(tempDirectory, "output"), 0755) + if err != nil { + return err + } + + // Run bash command + cmd = exec.Command("bash", "-e", "-c", + "set -a\n"+ // Source and export functions and variables in source.sh script + ". \"${BPM_WORKDIR}\"/source.sh\n"+ + "set +a\n"+ + "(echo \"Running package() function\" && cd \"$BPM_SOURCE\" && fakeroot -s \"$BPM_WORKDIR\"/fakeroot_file package)\n"+ // Run package() function + "fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file find \"$BPM_OUTPUT\" -mindepth 1 -printf \"%P %#m %U %G %s\\n\" > \"$BPM_WORKDIR\"/pkg.files") // Create package file list + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + err = cmd.Run() + if err != nil { + return err + } + + // Create gzip-compressed archive for the package files + cmd = exec.Command("bash", "-c", "find output -printf \"%P\\n\" | fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file tar -czf files.tar.gz --no-recursion -C output -T -") + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + err = cmd.Run() + if err != nil { + return fmt.Errorf("files.tar.gz archive could not be created: %s", err) + } + + // Copy pkgInfo struct and set package type to binary + pkgInfo := bpmpkg.PkgInfo + pkgInfo.Type = "binary" + + // Marshal package info + pkgInfoBytes, err := yaml.Marshal(pkgInfo) + if err != nil { + return err + } + pkgInfoBytes = append(pkgInfoBytes, '\n') + + // Create pkg.info file + err = os.WriteFile(path.Join(tempDirectory, "pkg.info"), pkgInfoBytes, 0644) + if err != nil { + return err + } + + // Create final BPM archive + cmd = exec.Command("bash", "-c", "tar -cf "+outputFilename+" --owner=0 --group=0 -C \"$BPM_WORKDIR\" pkg.info pkg.files ${PACKAGE_SCRIPTS[@]} files.tar.gz") + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + currentDir, err := os.Getwd() + if err != nil { + return err + } + cmd.Env = append(env, "CURRENT_DIR="+currentDir) + err = cmd.Run() + if err != nil { + return fmt.Errorf("BPM archive could not be created: %s", err) + } + + return nil +} diff --git a/src/bpmlib/tarball.go b/src/bpmlib/tarball.go index 84a0008..a6ef764 100644 --- a/src/bpmlib/tarball.go +++ b/src/bpmlib/tarball.go @@ -5,6 +5,8 @@ import ( "errors" "io" "os" + "path" + "strings" ) type tarballFileReader struct { @@ -41,3 +43,65 @@ func readTarballContent(tarballPath, fileToExtract string) (*tarballFileReader, return nil, errors.New("could not file in tarball") } + +func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory string) (err error) { + file, err := os.Open(tarballPath) + if err != nil { + return err + } + defer file.Close() + + tr := tar.NewReader(file) + for { + header, err := tr.Next() + if err == io.EOF { + break + } + if err != nil { + return err + } + + if strings.HasPrefix(header.Name, directoryToExtract+"/") { + // Skip directory to extract + if strings.TrimRight(header.Name, "/") == workingDirectory { + continue + } + + // Trim directory name from header name + header.Name = strings.TrimPrefix(header.Name, directoryToExtract+"/") + outputPath := path.Join(workingDirectory, header.Name) + + switch header.Typeflag { + case tar.TypeDir: + // Create directory + err := os.MkdirAll(outputPath, 0755) + if err != nil { + return err + } + case tar.TypeReg: + // Create file and set permissions + file, err = os.Create(outputPath) + if err != nil { + return err + } + err := file.Chmod(header.FileInfo().Mode()) + if err != nil { + return err + } + + // Copy data to file + _, err = io.Copy(file, tr) + if err != nil { + return err + } + + // Close file + file.Close() + default: + continue + } + } + } + + return nil +} -- 2.47.2 From 8b6ef5fa63b776407729b4abce780a0da7681e79 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 22 Apr 2025 17:41:37 +0300 Subject: [PATCH 02/33] Added compilation environment array to BPM config --- config/bpm.conf | 1 + src/bpmlib/compilation.go | 1 + src/bpmlib/config.go | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/bpm.conf b/config/bpm.conf index 3e8e4ae..2f2e876 100644 --- a/config/bpm.conf +++ b/config/bpm.conf @@ -1,4 +1,5 @@ ignore_packages: [] +compilation_env: [] repositories: - name: example-repository source: https://my-repo.xyz/ diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index be677e4..08f26d4 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -89,6 +89,7 @@ func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { env = append(env, "BPM_PKG_VERSION="+bpmpkg.PkgInfo.Version) env = append(env, "BPM_PKG_REVISION="+strconv.Itoa(bpmpkg.PkgInfo.Revision)) env = append(env, "BPM_PKG_ARCH="+GetArch()) + env = append(env, BPMConfig.CompilationEnvironment...) // Execute prepare and build functions in source.sh script cmd := exec.Command("bash", "-c", diff --git a/src/bpmlib/config.go b/src/bpmlib/config.go index eee5d57..ebf0224 100644 --- a/src/bpmlib/config.go +++ b/src/bpmlib/config.go @@ -6,8 +6,9 @@ import ( ) type BPMConfigStruct struct { - IgnorePackages []string `yaml:"ignore_packages"` - Repositories []*Repository `yaml:"repositories"` + IgnorePackages []string `yaml:"ignore_packages"` + CompilationEnvironment []string `yaml:"compilation_env"` + Repositories []*Repository `yaml:"repositories"` } var BPMConfig BPMConfigStruct -- 2.47.2 From 6af3b77d693ea8c1afc4969246a60fce319419df Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 22 Apr 2025 19:10:53 +0300 Subject: [PATCH 03/33] Include package scripts in compilation --- src/bpmlib/compilation.go | 34 ++++++++-------- src/bpmlib/packages.go | 29 +++++++++++++- src/bpmlib/tarball.go | 84 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 126 insertions(+), 21 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 08f26d4..ccc6beb 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" "gopkg.in/yaml.v3" - "io" "os" "os/exec" "path" "strconv" + "strings" ) func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { @@ -46,25 +46,18 @@ func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { } // Extract source.sh file - content, err := readTarballContent(archiveFilename, "source.sh") + err = extractTarballFile(archiveFilename, "source.sh", tempDirectory) if err != nil { return err } - sourceFile, err := os.Create(path.Join(tempDirectory, "source.sh")) - if err != nil { - return err - } - _, err = io.Copy(sourceFile, content.tarReader) - if err != nil { - return err - } - err = sourceFile.Close() - if err != nil { - return err - } - err = content.file.Close() - if err != nil { - return err + + // Get package scripts and extract them + packageScripts := getPackageScripts(archiveFilename) + for _, script := range packageScripts { + err = extractTarballFile(archiveFilename, script, tempDirectory) + if err != nil { + return err + } } // Extract source files @@ -167,8 +160,13 @@ func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { return err } + // Get files to include in BPM archive + bpmArchiveFiles := make([]string, 0) + bpmArchiveFiles = append(bpmArchiveFiles, "pkg.info", "pkg.files", "files.tar.gz") // Base files + bpmArchiveFiles = append(bpmArchiveFiles, packageScripts...) // Package scripts + // Create final BPM archive - cmd = exec.Command("bash", "-c", "tar -cf "+outputFilename+" --owner=0 --group=0 -C \"$BPM_WORKDIR\" pkg.info pkg.files ${PACKAGE_SCRIPTS[@]} files.tar.gz") + cmd = exec.Command("bash", "-c", "tar -cf "+outputFilename+" --owner=0 --group=0 -C \"$BPM_WORKDIR\" "+strings.Join(bpmArchiveFiles, " ")) cmd.Dir = tempDirectory cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index da57201..ec0df7a 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -218,6 +218,31 @@ func ReadPackage(filename string) (*BPMPackage, error) { }, nil } +func getPackageScripts(filename string) (packageScripts []string) { + content, err := listTarballContent(filename) + if err != nil { + return + } + + for _, file := range content { + if file == "pre_install.sh" { + packageScripts = append(packageScripts, "pre_install.sh") + } else if file == "post_install.sh" { + packageScripts = append(packageScripts, "post_install.sh") + } else if file == "pre_update.sh" { + packageScripts = append(packageScripts, "pre_update.sh") + } else if file == "post_update.sh" { + packageScripts = append(packageScripts, "post_update.sh") + } else if file == "pre_remove.sh" { + packageScripts = append(packageScripts, "pre_remove.sh") + } else if file == "post_remove.sh" { + packageScripts = append(packageScripts, "post_remove.sh") + } + } + + return packageScripts +} + func ReadPackageScripts(filename string) (map[string]string, error) { if _, err := os.Stat(filename); os.IsNotExist(err) { return nil, err @@ -480,7 +505,7 @@ func extractPackage(bpmpkg *BPMPackage, verbose bool, filename, rootDir string) return err } - tarballFile, err := readTarballContent(filename, "files.tar.gz") + tarballFile, err := readTarballFile(filename, "files.tar.gz") if err != nil { return err } @@ -738,7 +763,7 @@ func installPackage(filename, rootDir string, verbose, force bool) error { return err } - tarballFile, err := readTarballContent(filename, "pkg.files") + tarballFile, err := readTarballFile(filename, "pkg.files") if err != nil { return err } diff --git a/src/bpmlib/tarball.go b/src/bpmlib/tarball.go index a6ef764..f60f96a 100644 --- a/src/bpmlib/tarball.go +++ b/src/bpmlib/tarball.go @@ -14,7 +14,35 @@ type tarballFileReader struct { file *os.File } -func readTarballContent(tarballPath, fileToExtract string) (*tarballFileReader, error) { +func listTarballContent(tarballPath string) (content []string, err error) { + file, err := os.Open(tarballPath) + if err != nil { + return nil, err + } + defer file.Close() + + tr := tar.NewReader(file) + for { + header, err := tr.Next() + if err == io.EOF { + break + } + if err != nil { + return nil, err + } + + switch header.Typeflag { + case tar.TypeDir: + continue + default: + content = append(content, header.Name) + } + } + + return content, nil +} + +func readTarballFile(tarballPath, fileToExtract string) (*tarballFileReader, error) { file, err := os.Open(tarballPath) if err != nil { return nil, err @@ -44,6 +72,60 @@ func readTarballContent(tarballPath, fileToExtract string) (*tarballFileReader, return nil, errors.New("could not file in tarball") } +func extractTarballFile(tarballPath, fileToExtract string, workingDirectory string) (err error) { + file, err := os.Open(tarballPath) + if err != nil { + return err + } + defer file.Close() + + tr := tar.NewReader(file) + for { + header, err := tr.Next() + if err == io.EOF { + break + } + if err != nil { + return err + } + + // Skip if filename does not match + if header.Name != fileToExtract { + continue + } + + // Trim directory name from header name + header.Name = strings.Split(header.Name, "/")[len(strings.Split(header.Name, "/"))-1] + outputPath := path.Join(workingDirectory, header.Name) + + switch header.Typeflag { + case tar.TypeReg: + // Create file and set permissions + file, err = os.Create(outputPath) + if err != nil { + return err + } + err := file.Chmod(header.FileInfo().Mode()) + if err != nil { + return err + } + + // Copy data to file + _, err = io.Copy(file, tr) + if err != nil { + return err + } + + // Close file + file.Close() + default: + continue + } + } + + return nil +} + func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory string) (err error) { file, err := os.Open(tarballPath) if err != nil { -- 2.47.2 From 1843bceef5cffb045058de547735d4b40255273c Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 22 Apr 2025 19:28:36 +0300 Subject: [PATCH 04/33] Fix pre_remove.sh package script not being read or run --- src/bpmlib/packages.go | 85 ++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index ec0df7a..85b6772 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -8,6 +8,7 @@ import ( version "github.com/knqyf263/go-rpm-version" "gopkg.in/yaml.v3" "io" + "log" "os" "os/exec" "path" @@ -262,31 +263,7 @@ func ReadPackageScripts(filename string) (map[string]string, error) { if err != nil { return nil, err } - if header.Name == "pre_install.sh" { - bs, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - ret[header.Name] = string(bs) - } else if header.Name == "post_install.sh" { - bs, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - ret[header.Name] = string(bs) - } else if header.Name == "pre_update.sh" { - bs, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - ret[header.Name] = string(bs) - } else if header.Name == "post_update.sh" { - bs, err := io.ReadAll(tr) - if err != nil { - return nil, err - } - ret[header.Name] = string(bs) - } else if header.Name == "post_remove.sh" { + if header.Name == "pre_install.sh" || header.Name == "post_install.sh" || header.Name == "pre_update.sh" || header.Name == "post_update.sh" || header.Name == "pre_remove.sh" || header.Name == "post_remove.sh" { bs, err := io.ReadAll(tr) if err != nil { return nil, err @@ -791,23 +768,30 @@ func installPackage(filename, rootDir string, verbose, force bool) error { return err } - scripts, err := ReadPackageScripts(filename) + // Save remove package scripts + packageScripts, err := ReadPackageScripts(filename) if err != nil { return err } - if val, ok := scripts["post_remove.sh"]; ok { - f, err = os.Create(path.Join(pkgDir, "post_remove.sh")) + for script, content := range packageScripts { + if !strings.HasSuffix(script, "_remove.sh") { + continue + } + + // Create file + f, err = os.Create(path.Join(pkgDir, script)) if err != nil { return err } - _, err = f.WriteString(val) - if err != nil { - return err - } - err = f.Close() + + // Write script contents to file + _, err = f.WriteString(content) if err != nil { return err } + + // Close file + f.Close() } if !packageInstalled { @@ -1138,6 +1122,24 @@ func removePackage(pkg string, verbose bool, rootDir string) error { return errors.New("could not get package info") } + // Executing pre_remove script + if _, err := os.Stat(path.Join(pkgDir, "pre_remove.sh")); err == nil { + cmd := exec.Command("/bin/bash", path.Join(pkgDir, "pre_remove.sh")) + cmd.Dir = rootDir + cmd.Env = os.Environ() + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_ROOT=%s", rootDir)) + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_NAME=%s", pkgInfo.Name)) + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_VERSION=%s", pkgInfo.Version)) + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_REVISION=%d", pkgInfo.Revision)) + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_URL=%s", pkgInfo.Url)) + cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_ARCH=%s", pkgInfo.Arch)) + + err = cmd.Run() + if err != nil { + log.Printf("Warning: could not run pre_remove.sh package script: %s", err) + } + } + // Fetching and reversing package file entry list fileEntries := GetPackageFiles(pkg, rootDir) sort.Slice(fileEntries, func(i, j int) bool { @@ -1218,27 +1220,14 @@ func removePackage(pkg string, verbose bool, rootDir string) error { cmd.Env = os.Environ() cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_ROOT=%s", rootDir)) cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_NAME=%s", pkgInfo.Name)) - cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_DESC=%s", pkgInfo.Description)) cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_VERSION=%s", pkgInfo.Version)) cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_REVISION=%d", pkgInfo.Revision)) cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_URL=%s", pkgInfo.Url)) cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_ARCH=%s", pkgInfo.Arch)) - depends := make([]string, len(pkgInfo.Depends)) - copy(depends, pkgInfo.Depends) - for i := 0; i < len(depends); i++ { - depends[i] = fmt.Sprintf("\"%s\"", depends[i]) - } - makeDepends := make([]string, len(pkgInfo.MakeDepends)) - copy(makeDepends, pkgInfo.MakeDepends) - for i := 0; i < len(makeDepends); i++ { - makeDepends[i] = fmt.Sprintf("\"%s\"", makeDepends[i]) - } - cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_DEPENDS=(%s)", strings.Join(depends, " "))) - cmd.Env = append(cmd.Env, fmt.Sprintf("BPM_PKG_MAKE_DEPENDS=(%s)", strings.Join(makeDepends, " "))) - cmd.Env = append(cmd.Env, "BPM_PKG_TYPE=source") + err = cmd.Run() if err != nil { - return err + log.Printf("Warning: could not run pre_remove.sh package script: %s", err) } } -- 2.47.2 From 382a3fc8b61e3a1625a38b202d2699f5896be9ef Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 24 Apr 2025 13:56:30 +0300 Subject: [PATCH 05/33] Add flags for 'compile' subcommand --- config/bpm.conf | 1 + src/bpm/main.go | 138 +++++++++++++++++++++++++++++++++++++- src/bpmlib/compilation.go | 21 +++++- src/bpmlib/config.go | 1 + 4 files changed, 157 insertions(+), 4 deletions(-) diff --git a/config/bpm.conf b/config/bpm.conf index 2f2e876..6d31c3e 100644 --- a/config/bpm.conf +++ b/config/bpm.conf @@ -1,4 +1,5 @@ ignore_packages: [] +privilege_escalator_cmd: "sudo" compilation_env: [] repositories: - name: example-repository diff --git a/src/bpm/main.go b/src/bpm/main.go index f3c807b..b3dcf57 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -8,6 +8,7 @@ import ( "git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib" "log" "os" + "os/exec" "path" "path/filepath" "slices" @@ -39,6 +40,9 @@ var nosync = true var removeUnused = false var doCleanup = false var showRepoInfo = false +var installSrcPkgDepends = false +var skipChecks = false +var outputFilename = "" func main() { err := bpmlib.ReadConfig() @@ -576,20 +580,128 @@ func resolveCommand() { log.Fatalf("Error: cannot compile a non-source package!") } + // Get direct runtime and make dependencies + totalDepends := make([]string, 0) + for _, depend := range bpmpkg.PkgInfo.GetAllDependencies(true, false) { + if !slices.Contains(totalDepends, depend) { + totalDepends = append(totalDepends, depend) + } + } + + // Get unmet dependencies + unmetDepends := slices.Clone(totalDepends) + installedPackages, err := bpmlib.GetInstalledPackages("/") + if err != nil { + log.Fatalf("Error: could not get installed packages: %s\n", err) + } + for i := len(unmetDepends) - 1; i >= 0; i-- { + if slices.Contains(installedPackages, unmetDepends[i]) { + unmetDepends = append(unmetDepends[:i], unmetDepends[i+1:]...) + } + } + + // Install missing source package dependencies + if installSrcPkgDepends && len(unmetDepends) > 0 { + // Get path to current executable + executable, err := os.Executable() + if err != nil { + log.Fatalf("Error: could not get path to executable: %s\n", err) + } + + // Run 'bpm install' using the set privilege escalator command + cmd := exec.Command(bpmlib.BPMConfig.PrivilegeEscalatorCmd, executable, "install", "--installation-reason=dependency", strings.Join(unmetDepends, " ")) + if yesAll { + cmd.Args = slices.Insert(cmd.Args, 3, "-y") + } + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Stdin = os.Stdin + if verbose { + fmt.Println("Running command: " + cmd.String()) + } + err = cmd.Run() + if err != nil { + log.Fatalf("Error: dependency installation command failed: %s\n", err) + } + } else { + // Ensure the required dependencies are installed + if len(unmetDepends) != 0 { + log.Fatalf("Error: could not resolve dependencies: the following dependencies were not found in any repositories: " + strings.Join(unmetDepends, ", ")) + } + } + // Get current working directory workdir, err := os.Getwd() if err != nil { log.Fatalf("Error: could not get working directory: %s", err) } - outputFilename := fmt.Sprintf(path.Join(workdir, "%s-%s-%d.bpm"), bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision) + // Get user home directory + homedir, err := os.UserHomeDir() + if err != nil { + log.Fatalf("Error: could not get user home directory: %s", err) + } - err = bpmlib.CompileSourcePackage(sourcePackage, outputFilename) + // Trim output filename + outputFilename = strings.TrimSpace(outputFilename) + if outputFilename != "/" { + outputFilename = strings.TrimSuffix(outputFilename, "/") + } + + // Set output filename if empty + if outputFilename == "" { + outputFilename = path.Join(workdir, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) + } + + // Replace first tilde with user home directory + if strings.Split(outputFilename, "/")[0] == "~" { + outputFilename = strings.Replace(outputFilename, "~", homedir, 1) + } + + // Prepend current working directory to output filename if not an absolute path + if outputFilename != "" && !strings.HasPrefix(outputFilename, "/") { + outputFilename = filepath.Join(workdir, outputFilename) + } + + // Clean path + path.Clean(outputFilename) + + // Append archive filename if path is set to a directory + if stat, err := os.Stat(outputFilename); err == nil && stat.IsDir() { + outputFilename = path.Join(outputFilename, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) + } + + err = bpmlib.CompileSourcePackage(sourcePackage, outputFilename, skipChecks) if err != nil { log.Fatalf("Error: could not compile source package (%s): %s", sourcePackage, err) } fmt.Printf("Package (%s) was successfully compiled! Binary package generated at: %s\n", sourcePackage, outputFilename) + + // Remove unused packages + if installSrcPkgDepends && len(unmetDepends) > 0 { + // Get path to current executable + executable, err := os.Executable() + if err != nil { + log.Fatalf("Error: could not get path to executable: %s\n", err) + } + + // Run 'bpm cleanup' using the set privilege escalator command + cmd := exec.Command(bpmlib.BPMConfig.PrivilegeEscalatorCmd, executable, "cleanup") + if yesAll { + cmd.Args = slices.Insert(cmd.Args, 3, "-y") + } + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Stdin = os.Stdin + if verbose { + fmt.Println("Running command: " + cmd.String()) + } + err = cmd.Run() + if err != nil { + log.Fatalf("Error: dependency cleanup command failed: %s\n", err) + } + } } default: @@ -644,6 +756,13 @@ func printHelp() { fmt.Println(" -y skips the confirmation prompt") fmt.Println("-> bpm file [-R] | shows what packages the following packages are managed by") fmt.Println(" -R= lets you define the root path which will be used") + fmt.Println("-> bpm compile [-d, -s, -o] | Compile source BPM package") + fmt.Println(" -v Show additional information about what BPM is doing") + fmt.Println(" -d installs required dependencies for package compilation") + fmt.Println(" -s skips the check function in source.sh scripts") + fmt.Println(" -o sets output filename") + fmt.Println(" -y skips the confirmation prompt") + fmt.Println("\033[1m----------------\033[0m") } @@ -702,6 +821,15 @@ func resolveFlags() { fileFlagSet := flag.NewFlagSet("Remove flags", flag.ExitOnError) fileFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root") fileFlagSet.Usage = printHelp + // Compile flags + compileFlagSet := flag.NewFlagSet("Compile flags", flag.ExitOnError) + compileFlagSet.BoolVar(&installSrcPkgDepends, "d", false, "Install required dependencies for package compilation") + compileFlagSet.BoolVar(&skipChecks, "s", false, "Skip the check function in source.sh scripts") + compileFlagSet.StringVar(&outputFilename, "o", "", "Set output filename") + compileFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing") + compileFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts") + + compileFlagSet.Usage = printHelp if len(os.Args[1:]) <= 0 { subcommand = "help" } else { @@ -749,6 +877,12 @@ func resolveFlags() { return } subcommandArgs = fileFlagSet.Args() + } else if getCommandType() == compile { + err := compileFlagSet.Parse(subcommandArgs) + if err != nil { + return + } + subcommandArgs = compileFlagSet.Args() } if reinstallAll { reinstall = true diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index ccc6beb..387b4b3 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -11,7 +11,7 @@ import ( "strings" ) -func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { +func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks bool) (err error) { // Read BPM archive bpmpkg, err := ReadPackage(archiveFilename) if err != nil { @@ -91,7 +91,6 @@ func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { "set +a\n"+ "[[ $(type -t prepare) == \"function\" ]] && (echo \"Running prepare() function\" && cd \"$BPM_SOURCE\" && set -e && prepare)\n"+ // Run prepare() function if it exists "[[ $(type -t build) == \"function\" ]] && (echo \"Running build() function\" && cd \"$BPM_SOURCE\" && set -e && build)\n"+ // Run build() function if it exists - "[[ $(type -t check) == \"function\" ]] && (echo \"Running check() function\" && cd \"$BPM_SOURCE\" && set -e && check)\n"+ // Run check() function if it exists "exit 0") cmd.Dir = tempDirectory cmd.Stdout = os.Stdout @@ -102,6 +101,24 @@ func CompileSourcePackage(archiveFilename, outputFilename string) (err error) { return err } + // Execute check function in source.sh script if not skipping checks + if !skipChecks { + cmd = exec.Command("bash", "-c", + "set -a\n"+ // Source and export functions and variables in source.sh script + ". \"${BPM_WORKDIR}\"/source.sh\n"+ + "set +a\n"+ + "[[ $(type -t check) == \"function\" ]] && (echo \"Running check() function\" && cd \"$BPM_SOURCE\" && set -e && check)\n"+ // Run check() function if it exists + "exit 0") + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + err = cmd.Run() + if err != nil { + return err + } + } + // Remove 'output' directory if it already exists if _, err := os.Stat(path.Join(tempDirectory, "output")); err == nil { err := os.RemoveAll(path.Join(tempDirectory, "output")) diff --git a/src/bpmlib/config.go b/src/bpmlib/config.go index ebf0224..fbf5fda 100644 --- a/src/bpmlib/config.go +++ b/src/bpmlib/config.go @@ -7,6 +7,7 @@ import ( type BPMConfigStruct struct { IgnorePackages []string `yaml:"ignore_packages"` + PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"` CompilationEnvironment []string `yaml:"compilation_env"` Repositories []*Repository `yaml:"repositories"` } -- 2.47.2 From b73519ba9cf23ac1cdd215dffc19bff07370a6ca Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 24 Apr 2025 16:44:37 +0300 Subject: [PATCH 06/33] Fix shell commands used in source package compilation --- src/bpmlib/compilation.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 387b4b3..b1bd998 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -89,8 +89,8 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo "set -a\n"+ // Source and export functions and variables in source.sh script ". \"${BPM_WORKDIR}\"/source.sh\n"+ "set +a\n"+ - "[[ $(type -t prepare) == \"function\" ]] && (echo \"Running prepare() function\" && cd \"$BPM_SOURCE\" && set -e && prepare)\n"+ // Run prepare() function if it exists - "[[ $(type -t build) == \"function\" ]] && (echo \"Running build() function\" && cd \"$BPM_SOURCE\" && set -e && build)\n"+ // Run build() function if it exists + "[[ $(type -t prepare) == \"function\" ]] && { echo \"Running prepare() function\"; bash -e -c 'cd \"$BPM_SOURCE\" && prepare' || exit 1; }\n"+ // Run prepare() function if it exists + "[[ $(type -t build) == \"function\" ]] && { echo \"Running build() function\"; bash -e -c 'cd \"$BPM_SOURCE\" && build' || exit 1; }\n"+ // Run build() function if it exists "exit 0") cmd.Dir = tempDirectory cmd.Stdout = os.Stdout @@ -107,7 +107,7 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo "set -a\n"+ // Source and export functions and variables in source.sh script ". \"${BPM_WORKDIR}\"/source.sh\n"+ "set +a\n"+ - "[[ $(type -t check) == \"function\" ]] && (echo \"Running check() function\" && cd \"$BPM_SOURCE\" && set -e && check)\n"+ // Run check() function if it exists + "[[ $(type -t check) == \"function\" ]] && { echo \"Running check() function\"; bash -e -c 'cd \"$BPM_SOURCE\" && check' || exit 1; }\n"+ // Run check() function if it exists "exit 0") cmd.Dir = tempDirectory cmd.Stdout = os.Stdout @@ -133,12 +133,13 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } - // Run bash command - cmd = exec.Command("bash", "-e", "-c", + // Execute package function in source.sh script and generate package file list + cmd = exec.Command("bash", "-c", "set -a\n"+ // Source and export functions and variables in source.sh script ". \"${BPM_WORKDIR}\"/source.sh\n"+ "set +a\n"+ - "(echo \"Running package() function\" && cd \"$BPM_SOURCE\" && fakeroot -s \"$BPM_WORKDIR\"/fakeroot_file package)\n"+ // Run package() function + "echo \"Running package() function\"\n"+ + "( cd \"$BPM_SOURCE\" && fakeroot -s \"$BPM_WORKDIR\"/fakeroot_file bash -e -c 'package' ) || exit 1\n"+ // Run package() function "fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file find \"$BPM_OUTPUT\" -mindepth 1 -printf \"%P %#m %U %G %s\\n\" > \"$BPM_WORKDIR\"/pkg.files") // Create package file list cmd.Dir = tempDirectory cmd.Stdout = os.Stdout -- 2.47.2 From 4bf9ac9c60566be7866af585c491c4004e6c79dc Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 24 Apr 2025 17:39:17 +0300 Subject: [PATCH 07/33] Add .compilation-options file support --- src/bpmlib/compilation.go | 57 ++++++++++++++++++++++++++++++++++++++- src/bpmlib/utils.go | 2 +- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index b1bd998..9ff3b51 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -23,6 +23,12 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return errors.New("cannot compile a non-source package") } + // Read compilation options file in current directory + compilationOptions, err := readCompilationOptionsFile() + if err != nil { + return err + } + // Get HOME directory homeDir, err := os.UserHomeDir() if err != nil { @@ -81,7 +87,12 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo env = append(env, "BPM_PKG_NAME="+bpmpkg.PkgInfo.Name) env = append(env, "BPM_PKG_VERSION="+bpmpkg.PkgInfo.Version) env = append(env, "BPM_PKG_REVISION="+strconv.Itoa(bpmpkg.PkgInfo.Revision)) - env = append(env, "BPM_PKG_ARCH="+GetArch()) + // Check for architecture override in compilation options + if val, ok := compilationOptions["ARCH"]; ok { + env = append(env, "BPM_PKG_ARCH="+val) + } else { + env = append(env, "BPM_PKG_ARCH="+GetArch()) + } env = append(env, BPMConfig.CompilationEnvironment...) // Execute prepare and build functions in source.sh script @@ -200,3 +211,47 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return nil } + +func readCompilationOptionsFile() (options map[string]string, err error) { + // Initialize options map + options = make(map[string]string) + + // Check if file compilation options file exists + stat, err := os.Stat(".compilation-options") + if err != nil { + return nil, nil + } + + // Ensure it is a regular file + if !stat.Mode().IsRegular() { + return nil, fmt.Errorf("%s is not a regular file", stat.Name()) + } + + // Read file data + data, err := os.ReadFile(stat.Name()) + if err != nil { + return nil, err + } + + for _, line := range strings.Split(string(data), "\n") { + // Trim line + line = strings.TrimSpace(line) + + // Skip empty lines + if line == "" { + continue + } + + // Split line + split := strings.SplitN(line, "=", 2) + + // Throw error if line isn't valid + if len(split) < 2 { + return nil, fmt.Errorf("invalid line in compilation-options file: '%s'", line) + } + + options[split[0]] = split[1] + } + + return options, nil +} diff --git a/src/bpmlib/utils.go b/src/bpmlib/utils.go index a89dff8..707a46b 100644 --- a/src/bpmlib/utils.go +++ b/src/bpmlib/utils.go @@ -12,7 +12,7 @@ func GetArch() string { uname := syscall.Utsname{} err := syscall.Uname(&uname) if err != nil { - return "" + return "unknown" } var byteString [65]byte -- 2.47.2 From c8c1fded76faf704bedbeed86525abd948f69df4 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 24 Apr 2025 18:03:32 +0300 Subject: [PATCH 08/33] Set output package architecture after compilation --- src/bpmlib/compilation.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 9ff3b51..1c7ea75 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -172,10 +172,19 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return fmt.Errorf("files.tar.gz archive could not be created: %s", err) } - // Copy pkgInfo struct and set package type to binary + // Copy pkgInfo struct pkgInfo := bpmpkg.PkgInfo + + // Set package type to binary pkgInfo.Type = "binary" + // Set package architecture + if val, ok := compilationOptions["ARCH"]; ok { + pkgInfo.Arch = val + } else { + pkgInfo.Arch = GetArch() + } + // Marshal package info pkgInfoBytes, err := yaml.Marshal(pkgInfo) if err != nil { -- 2.47.2 From d8146cb3f3a9dc103753d0708f5448a8f35a7bc4 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 24 Apr 2025 18:03:57 +0300 Subject: [PATCH 09/33] Remove unused function --- src/bpmlib/utils.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/bpmlib/utils.go b/src/bpmlib/utils.go index 707a46b..99275a0 100644 --- a/src/bpmlib/utils.go +++ b/src/bpmlib/utils.go @@ -2,9 +2,7 @@ package bpmlib import ( "fmt" - "io" "math" - "os" "syscall" ) @@ -23,29 +21,6 @@ func GetArch() string { return string(byteString[:indexLength]) } -func copyFileContents(src, dst string) (err error) { - in, err := os.Open(src) - if err != nil { - return - } - defer in.Close() - out, err := os.Create(dst) - if err != nil { - return - } - defer func() { - cerr := out.Close() - if err == nil { - err = cerr - } - }() - if _, err = io.Copy(out, in); err != nil { - return - } - err = out.Sync() - return -} - func stringSliceRemove(s []string, r string) []string { for i, v := range s { if v == r { -- 2.47.2 From 9cdb3d29aa0a5424d2d631f9563537aa768be17e Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 25 Apr 2025 14:13:12 +0300 Subject: [PATCH 10/33] Reallow direct source package installation using 'bpm install' --- Makefile | 6 ++- src/bpmlib/compilation.go | 80 ++++++++++++++++++++++++++++++++++++--- src/bpmlib/operations.go | 34 ++++++++++++++++- src/bpmlib/packages.go | 19 +++++----- src/bpmlib/tarball.go | 24 +++++++++++- 5 files changed, 143 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 1b4a678..7c8a82e 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,13 @@ SYSCONFDIR := $(PREFIX)/etc # Compilers and tools GO ?= $(shell which go) +# Build-time variables +ROOT_COMPILATION_UID ?= 65534 +ROOT_COMPILATION_GID ?= 65534 + build: mkdir -p build - cd src/bpm; $(GO) build -ldflags "-w" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm + cd src/bpm; $(GO) build -ldflags "-w -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 install: build/bpm config/ # Create directories diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 1c7ea75..e0e0f99 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -9,8 +9,12 @@ import ( "path" "strconv" "strings" + "syscall" ) +var rootCompilationUID = "65534" +var rootCompilationGID = "65534" + func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks bool) (err error) { // Read BPM archive bpmpkg, err := ReadPackage(archiveFilename) @@ -35,6 +39,24 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } + // Get UID and GID to use for compilation + var uid, gid int + if os.Getuid() == 0 { + _uid, err := strconv.ParseInt(rootCompilationUID, 10, 32) + if err != nil { + return fmt.Errorf("could not convert UID '%s' to int", rootCompilationUID) + } + _gid, err := strconv.ParseInt(rootCompilationGID, 10, 32) + if err != nil { + return fmt.Errorf("could not convert GID '%s' to int", rootCompilationGID) + } + uid = int(_uid) + gid = int(_gid) + } else { + uid = os.Getuid() + gid = os.Getgid() + } + tempDirectory := path.Join(homeDir, ".cache/bpm/compilation/", bpmpkg.PkgInfo.Name) // Ensure temporary directory does not exist @@ -51,8 +73,14 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } + // Change temporary directory owner + err = os.Chown(tempDirectory, uid, gid) + if err != nil { + return err + } + // Extract source.sh file - err = extractTarballFile(archiveFilename, "source.sh", tempDirectory) + err = extractTarballFile(archiveFilename, "source.sh", tempDirectory, uid, gid) if err != nil { return err } @@ -60,14 +88,14 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo // Get package scripts and extract them packageScripts := getPackageScripts(archiveFilename) for _, script := range packageScripts { - err = extractTarballFile(archiveFilename, script, tempDirectory) + err = extractTarballFile(archiveFilename, script, tempDirectory, uid, gid) if err != nil { return err } } // Extract source files - err = extractTarballDirectory(archiveFilename, "source-files", tempDirectory) + err = extractTarballDirectory(archiveFilename, "source-files", tempDirectory, uid, gid) if err != nil { return err } @@ -78,6 +106,12 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } + // Change source directory owner + err = os.Chown(path.Join(tempDirectory, "source"), uid, gid) + if err != nil { + return err + } + // Setup environment for commands env := os.Environ() env = append(env, "HOME="+tempDirectory) @@ -107,6 +141,8 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { return err @@ -124,13 +160,15 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { return err } } - // Remove 'output' directory if it already exists + // Remove output directory if it already exists if _, err := os.Stat(path.Join(tempDirectory, "output")); err == nil { err := os.RemoveAll(path.Join(tempDirectory, "output")) if err != nil { @@ -138,12 +176,18 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo } } - // Create new 'output' directory + // Create new output directory err = os.Mkdir(path.Join(tempDirectory, "output"), 0755) if err != nil { return err } + // Change output directory owner + err = os.Chown(path.Join(tempDirectory, "output"), uid, gid) + if err != nil { + return err + } + // Execute package function in source.sh script and generate package file list cmd = exec.Command("bash", "-c", "set -a\n"+ // Source and export functions and variables in source.sh script @@ -156,6 +200,8 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { return err @@ -167,6 +213,8 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { return fmt.Errorf("files.tar.gz archive could not be created: %s", err) @@ -198,13 +246,19 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } + // Change pkg.info file owner + err = os.Chown(path.Join(tempDirectory, "pkg.info"), uid, gid) + if err != nil { + return err + } + // Get files to include in BPM archive bpmArchiveFiles := make([]string, 0) bpmArchiveFiles = append(bpmArchiveFiles, "pkg.info", "pkg.files", "files.tar.gz") // Base files bpmArchiveFiles = append(bpmArchiveFiles, packageScripts...) // Package scripts // Create final BPM archive - cmd = exec.Command("bash", "-c", "tar -cf "+outputFilename+" --owner=0 --group=0 -C \"$BPM_WORKDIR\" "+strings.Join(bpmArchiveFiles, " ")) + cmd = exec.Command("bash", "-c", "tar -cf final-archive.bpm --owner=0 --group=0 -C \"$BPM_WORKDIR\" "+strings.Join(bpmArchiveFiles, " ")) cmd.Dir = tempDirectory cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr @@ -213,11 +267,25 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return err } cmd.Env = append(env, "CURRENT_DIR="+currentDir) + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { return fmt.Errorf("BPM archive could not be created: %s", err) } + // Move final BPM archive + err = os.Rename(path.Join(tempDirectory, "final-archive.bpm"), outputFilename) + if err != nil { + return err + } + + // Set final BPM archive owner + err = os.Chown(outputFilename, os.Getuid(), os.Getgid()) + if err != nil { + return err + } + return nil } diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index f072759..1078be9 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -466,13 +466,43 @@ func (operation *BPMOperation) Execute(verbose, force bool) error { } } else if action.GetActionType() == "install" { value := action.(*InstallPackageAction) + fileToInstall := value.File bpmpkg := value.BpmPackage isReinstall := IsPackageInstalled(bpmpkg.PkgInfo.Name, operation.RootDir) var err error + + // Compile package if type is 'source' + if bpmpkg.PkgInfo.Type == "source" { + // Get path to compiled package directory and output filename + compiledDir := path.Join(operation.RootDir, "/var/lib/bpm/compiled/") + outputFilename := path.Join(compiledDir, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) + + // Create compiled package directory if not exists + if _, err := os.Stat(compiledDir); err != nil { + err := os.MkdirAll(compiledDir, 0755) + if err != nil { + return err + } + } + + // Compile source package + err = CompileSourcePackage(value.File, outputFilename, false) + if err != nil { + return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) + } + + // Set values + fileToInstall = outputFilename + bpmpkg, err = ReadPackage(outputFilename) + if err != nil { + return fmt.Errorf("could not read package (%s): %s\n", fileToInstall, err) + } + } + if value.IsDependency { - err = installPackage(value.File, operation.RootDir, verbose, true) + err = installPackage(fileToInstall, operation.RootDir, verbose, true) } else { - err = installPackage(value.File, operation.RootDir, verbose, force) + err = installPackage(fileToInstall, operation.RootDir, verbose, force) } if err != nil { return errors.New(fmt.Sprintf("could not install package (%s): %s\n", bpmpkg.PkgInfo.Name, err)) diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 85b6772..7f29197 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -607,6 +607,12 @@ func installPackage(filename, rootDir string, verbose, force bool) error { if err != nil { return err } + + // Ensure package type is 'binary' + if bpmpkg.PkgInfo.Type != "binary" { + return fmt.Errorf("can only extract binary packages") + } + packageInstalled := IsPackageInstalled(bpmpkg.PkgInfo.Name, rootDir) // Check if package is installed and remove current files if packageInstalled { @@ -712,15 +718,10 @@ func installPackage(filename, rootDir string, verbose, force bool) error { fmt.Printf("Extracting files for package (%s)...\n", bpmpkg.PkgInfo.Name) } - if bpmpkg.PkgInfo.Type == "binary" { - err := extractPackage(bpmpkg, verbose, filename, rootDir) - if err != nil { - return err - } - } else if bpmpkg.PkgInfo.Type == "source" { - return errors.New("direct source package compilation in BPM has been temporarily removed and is being reworked on") - } else { - return errors.New("unknown package type: " + bpmpkg.PkgInfo.Type) + // Extract package files into rootDir + err = extractPackage(bpmpkg, verbose, filename, rootDir) + if err != nil { + return err } installedDir := path.Join(rootDir, "var/lib/bpm/installed/") diff --git a/src/bpmlib/tarball.go b/src/bpmlib/tarball.go index f60f96a..df9876d 100644 --- a/src/bpmlib/tarball.go +++ b/src/bpmlib/tarball.go @@ -72,7 +72,7 @@ func readTarballFile(tarballPath, fileToExtract string) (*tarballFileReader, err return nil, errors.New("could not file in tarball") } -func extractTarballFile(tarballPath, fileToExtract string, workingDirectory string) (err error) { +func extractTarballFile(tarballPath, fileToExtract string, workingDirectory string, uid, gid int) (err error) { file, err := os.Open(tarballPath) if err != nil { return err @@ -109,6 +109,12 @@ func extractTarballFile(tarballPath, fileToExtract string, workingDirectory stri if err != nil { return err } + if uid >= 0 && gid >= 0 { + err = file.Chown(uid, gid) + if err != nil { + return err + } + } // Copy data to file _, err = io.Copy(file, tr) @@ -126,7 +132,7 @@ func extractTarballFile(tarballPath, fileToExtract string, workingDirectory stri return nil } -func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory string) (err error) { +func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory string, uid, gid int) (err error) { file, err := os.Open(tarballPath) if err != nil { return err @@ -160,6 +166,14 @@ func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory s if err != nil { return err } + + // Set directory owner + if uid >= 0 && gid >= 0 { + err = os.Chown(outputPath, uid, gid) + if err != nil { + return err + } + } case tar.TypeReg: // Create file and set permissions file, err = os.Create(outputPath) @@ -170,6 +184,12 @@ func extractTarballDirectory(tarballPath, directoryToExtract, workingDirectory s if err != nil { return err } + if uid >= 0 && gid >= 0 { + err = file.Chown(uid, gid) + if err != nil { + return err + } + } // Copy data to file _, err = io.Copy(file, tr) -- 2.47.2 From 5085981f5225c7bcc915d5a34f2908b9d85ead3b Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 26 Apr 2025 15:29:45 +0300 Subject: [PATCH 11/33] Allow split source package compilation --- src/bpm/main.go | 6 +- src/bpmlib/compilation.go | 330 +++++++++++++++++++++++--------------- src/bpmlib/general.go | 10 ++ src/bpmlib/operations.go | 4 +- src/bpmlib/packages.go | 39 +++-- 5 files changed, 238 insertions(+), 151 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index b3dcf57..7560c24 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -671,12 +671,14 @@ func resolveCommand() { outputFilename = path.Join(outputFilename, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) } - err = bpmlib.CompileSourcePackage(sourcePackage, outputFilename, skipChecks) + outputBpmPackages, err := bpmlib.CompileSourcePackage(sourcePackage, outputFilename, skipChecks) if err != nil { log.Fatalf("Error: could not compile source package (%s): %s", sourcePackage, err) } - fmt.Printf("Package (%s) was successfully compiled! Binary package generated at: %s\n", sourcePackage, outputFilename) + for k, v := range outputBpmPackages { + fmt.Printf("Package (%s) was successfully compiled! Binary package generated at: %s\n", k, v) + } // Remove unused packages if installSrcPkgDepends && len(unmetDepends) > 0 { diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index e0e0f99..370feb9 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -15,28 +15,31 @@ import ( var rootCompilationUID = "65534" var rootCompilationGID = "65534" -func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks bool) (err error) { +func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks bool) (outputBpmPackages map[string]string, err error) { + // Initialize map + outputBpmPackages = make(map[string]string) + // Read BPM archive bpmpkg, err := ReadPackage(archiveFilename) if err != nil { - return err + return nil, err } // Ensure package type is 'source' if bpmpkg.PkgInfo.Type != "source" { - return errors.New("cannot compile a non-source package") + return nil, errors.New("cannot compile a non-source package") } // Read compilation options file in current directory compilationOptions, err := readCompilationOptionsFile() if err != nil { - return err + return nil, err } // Get HOME directory homeDir, err := os.UserHomeDir() if err != nil { - return err + return nil, err } // Get UID and GID to use for compilation @@ -44,11 +47,11 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo if os.Getuid() == 0 { _uid, err := strconv.ParseInt(rootCompilationUID, 10, 32) if err != nil { - return fmt.Errorf("could not convert UID '%s' to int", rootCompilationUID) + return nil, fmt.Errorf("could not convert UID '%s' to int", rootCompilationUID) } _gid, err := strconv.ParseInt(rootCompilationGID, 10, 32) if err != nil { - return fmt.Errorf("could not convert GID '%s' to int", rootCompilationGID) + return nil, fmt.Errorf("could not convert GID '%s' to int", rootCompilationGID) } uid = int(_uid) gid = int(_gid) @@ -63,26 +66,26 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo if _, err := os.Stat(tempDirectory); err == nil { err := os.RemoveAll(tempDirectory) if err != nil { - return err + return nil, err } } // Create temporary directory err = os.MkdirAll(tempDirectory, 0755) if err != nil { - return err + return nil, err } // Change temporary directory owner err = os.Chown(tempDirectory, uid, gid) if err != nil { - return err + return nil, err } // Extract source.sh file err = extractTarballFile(archiveFilename, "source.sh", tempDirectory, uid, gid) if err != nil { - return err + return nil, err } // Get package scripts and extract them @@ -90,26 +93,26 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo for _, script := range packageScripts { err = extractTarballFile(archiveFilename, script, tempDirectory, uid, gid) if err != nil { - return err + return nil, err } } // Extract source files err = extractTarballDirectory(archiveFilename, "source-files", tempDirectory, uid, gid) if err != nil { - return err + return nil, err } // Create source directory err = os.Mkdir(path.Join(tempDirectory, "source"), 0755) if err != nil { - return err + return nil, err } // Change source directory owner err = os.Chown(path.Join(tempDirectory, "source"), uid, gid) if err != nil { - return err + return nil, err } // Setup environment for commands @@ -145,7 +148,7 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { - return err + return nil, err } // Execute check function in source.sh script if not skipping checks @@ -164,129 +167,192 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} err = cmd.Run() if err != nil { - return err + return nil, err } } - // Remove output directory if it already exists - if _, err := os.Stat(path.Join(tempDirectory, "output")); err == nil { - err := os.RemoveAll(path.Join(tempDirectory, "output")) + // Variable that will be used later + isSplitPkg := true + + // Get all packages to compile + packagesToCompile := bpmpkg.PkgInfo.SplitPackages + if len(packagesToCompile) == 0 { + packagesToCompile = append(packagesToCompile, bpmpkg.PkgInfo) + isSplitPkg = false + } + + // Compile each package + for _, pkg := range packagesToCompile { + // Get package function name + packageFunctionName := "package" + if isSplitPkg { + packageFunctionName = "package_" + pkg.Name + } + + // Remove output directory if it already exists + if _, err := os.Stat(path.Join(tempDirectory, "output")); err == nil { + err := os.RemoveAll(path.Join(tempDirectory, "output")) + if err != nil { + return nil, err + } + } + + // Create new output directory + err = os.Mkdir(path.Join(tempDirectory, "output"), 0755) if err != nil { - return err + return nil, err } + + // Change output directory owner + err = os.Chown(path.Join(tempDirectory, "output"), uid, gid) + if err != nil { + return nil, err + } + + // Execute package function in source.sh script and generate package file list + cmd = exec.Command("bash", "-c", + "set -a\n"+ // Source and export functions and variables in source.sh script + ". \"${BPM_WORKDIR}\"/source.sh\n"+ + "set +a\n"+ + "echo \"Running "+packageFunctionName+"() function\"\n"+ + "( cd \"$BPM_SOURCE\" && fakeroot -s \"$BPM_WORKDIR\"/fakeroot_file bash -e -c '"+packageFunctionName+"' ) || exit 1\n"+ // Run package() function + "fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file find \"$BPM_OUTPUT\" -mindepth 1 -printf \"%P %#m %U %G %s\\n\" > \"$BPM_WORKDIR\"/pkg.files") // Create package file list + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + err = cmd.Run() + if err != nil { + return nil, err + } + + // Create gzip-compressed archive for the package files + cmd = exec.Command("bash", "-c", "find output -printf \"%P\\n\" | fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file tar -czf files.tar.gz --no-recursion -C output -T -") + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Env = env + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + err = cmd.Run() + if err != nil { + return nil, fmt.Errorf("files.tar.gz archive could not be created: %s", err) + } + + // Clone source package info + var pkgInfo PackageInfo + if !isSplitPkg { + pkgInfo = *bpmpkg.PkgInfo + } else { + pkgInfo = *pkg + + // Ensure required fields are set + if strings.TrimSpace(pkgInfo.Name) == "" { + return nil, fmt.Errorf("split package name is empty") + } + + // Copy data from main source package + if pkgInfo.Description == "" { + pkgInfo.Description = bpmpkg.PkgInfo.Description + } + pkgInfo.Version = bpmpkg.PkgInfo.Version + pkgInfo.Revision = bpmpkg.PkgInfo.Revision + pkgInfo.Url = bpmpkg.PkgInfo.Url + if pkgInfo.License == "" { + pkgInfo.License = bpmpkg.PkgInfo.License + } + } + + // Set package type to binary + pkgInfo.Type = "binary" + + // Set package architecture + if val, ok := compilationOptions["ARCH"]; ok { + pkgInfo.Arch = val + } else { + pkgInfo.Arch = GetArch() + } + + // Remove source package specific fields + pkgInfo.MakeDepends = nil + pkgInfo.SplitPackages = nil + + // Marshal package info + pkgInfoBytes, err := yaml.Marshal(pkgInfo) + if err != nil { + return nil, err + } + pkgInfoBytes = append(pkgInfoBytes, '\n') + + // Create pkg.info file + err = os.WriteFile(path.Join(tempDirectory, "pkg.info"), pkgInfoBytes, 0644) + if err != nil { + return nil, err + } + + // Change pkg.info file owner + err = os.Chown(path.Join(tempDirectory, "pkg.info"), uid, gid) + if err != nil { + return nil, err + } + + // Get files to include in BPM archive + bpmArchiveFiles := make([]string, 0) + bpmArchiveFiles = append(bpmArchiveFiles, "pkg.info", "pkg.files", "files.tar.gz") // Base files + bpmArchiveFiles = append(bpmArchiveFiles, packageScripts...) // Package scripts + + // Create final BPM archive + cmd = exec.Command("bash", "-c", "tar -cf final-archive.bpm --owner=0 --group=0 -C \"$BPM_WORKDIR\" "+strings.Join(bpmArchiveFiles, " ")) + cmd.Dir = tempDirectory + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + currentDir, err := os.Getwd() + if err != nil { + return nil, err + } + cmd.Env = append(env, "CURRENT_DIR="+currentDir) + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + err = cmd.Run() + if err != nil { + return nil, fmt.Errorf("BPM archive could not be created: %s", err) + } + + // Remove pkg.info file + err = os.Remove(path.Join(tempDirectory, "pkg.info")) + if err != nil { + return nil, err + } + + // Set output filename if split package + if len(bpmpkg.PkgInfo.SplitPackages) != 1 { + // Get current working directory + workdir, err := os.Getwd() + if err != nil { + return nil, fmt.Errorf("could not get working directory: %s", err) + } + + outputFilename = path.Join(workdir, fmt.Sprintf("%s-%s-%d.bpm", pkgInfo.Name, pkgInfo.Version, pkgInfo.Revision)) + } + + // Move final BPM archive + err = os.Rename(path.Join(tempDirectory, "final-archive.bpm"), outputFilename) + if err != nil { + return nil, err + } + + // Set final BPM archive owner + err = os.Chown(outputFilename, os.Getuid(), os.Getgid()) + if err != nil { + return nil, err + } + + outputBpmPackages[pkgInfo.Name] = outputFilename } - // Create new output directory - err = os.Mkdir(path.Join(tempDirectory, "output"), 0755) - if err != nil { - return err - } - - // Change output directory owner - err = os.Chown(path.Join(tempDirectory, "output"), uid, gid) - if err != nil { - return err - } - - // Execute package function in source.sh script and generate package file list - cmd = exec.Command("bash", "-c", - "set -a\n"+ // Source and export functions and variables in source.sh script - ". \"${BPM_WORKDIR}\"/source.sh\n"+ - "set +a\n"+ - "echo \"Running package() function\"\n"+ - "( cd \"$BPM_SOURCE\" && fakeroot -s \"$BPM_WORKDIR\"/fakeroot_file bash -e -c 'package' ) || exit 1\n"+ // Run package() function - "fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file find \"$BPM_OUTPUT\" -mindepth 1 -printf \"%P %#m %U %G %s\\n\" > \"$BPM_WORKDIR\"/pkg.files") // Create package file list - cmd.Dir = tempDirectory - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} - err = cmd.Run() - if err != nil { - return err - } - - // Create gzip-compressed archive for the package files - cmd = exec.Command("bash", "-c", "find output -printf \"%P\\n\" | fakeroot -i \"$BPM_WORKDIR\"/fakeroot_file tar -czf files.tar.gz --no-recursion -C output -T -") - cmd.Dir = tempDirectory - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} - err = cmd.Run() - if err != nil { - return fmt.Errorf("files.tar.gz archive could not be created: %s", err) - } - - // Copy pkgInfo struct - pkgInfo := bpmpkg.PkgInfo - - // Set package type to binary - pkgInfo.Type = "binary" - - // Set package architecture - if val, ok := compilationOptions["ARCH"]; ok { - pkgInfo.Arch = val - } else { - pkgInfo.Arch = GetArch() - } - - // Marshal package info - pkgInfoBytes, err := yaml.Marshal(pkgInfo) - if err != nil { - return err - } - pkgInfoBytes = append(pkgInfoBytes, '\n') - - // Create pkg.info file - err = os.WriteFile(path.Join(tempDirectory, "pkg.info"), pkgInfoBytes, 0644) - if err != nil { - return err - } - - // Change pkg.info file owner - err = os.Chown(path.Join(tempDirectory, "pkg.info"), uid, gid) - if err != nil { - return err - } - - // Get files to include in BPM archive - bpmArchiveFiles := make([]string, 0) - bpmArchiveFiles = append(bpmArchiveFiles, "pkg.info", "pkg.files", "files.tar.gz") // Base files - bpmArchiveFiles = append(bpmArchiveFiles, packageScripts...) // Package scripts - - // Create final BPM archive - cmd = exec.Command("bash", "-c", "tar -cf final-archive.bpm --owner=0 --group=0 -C \"$BPM_WORKDIR\" "+strings.Join(bpmArchiveFiles, " ")) - cmd.Dir = tempDirectory - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - currentDir, err := os.Getwd() - if err != nil { - return err - } - cmd.Env = append(env, "CURRENT_DIR="+currentDir) - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} - err = cmd.Run() - if err != nil { - return fmt.Errorf("BPM archive could not be created: %s", err) - } - - // Move final BPM archive - err = os.Rename(path.Join(tempDirectory, "final-archive.bpm"), outputFilename) - if err != nil { - return err - } - - // Set final BPM archive owner - err = os.Chown(outputFilename, os.Getuid(), os.Getgid()) - if err != nil { - return err - } - - return nil + return outputBpmPackages, nil } func readCompilationOptionsFile() (options map[string]string, err error) { diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index c88ac32..4c7657a 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -38,6 +38,11 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein if reinstallMethod == ReinstallMethodNone && IsPackageInstalled(bpmpkg.PkgInfo.Name, rootDir) && GetPackageInfo(bpmpkg.PkgInfo.Name, rootDir).GetFullVersion() == bpmpkg.PkgInfo.GetFullVersion() { continue } + + if bpmpkg.PkgInfo.Type == "source" && len(bpmpkg.PkgInfo.SplitPackages) != 0 { + return nil, fmt.Errorf("direct source package installation has not been implemented") + } + operation.AppendAction(&InstallPackageAction{ File: pkg, IsDependency: false, @@ -63,6 +68,11 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein if reinstallMethod == ReinstallMethodNone && IsPackageInstalled(entry.Info.Name, rootDir) && GetPackageInfo(entry.Info.Name, rootDir).GetFullVersion() == entry.Info.GetFullVersion() { continue } + + if entry.Info.Type == "source" && len(entry.Info.SplitPackages) != 0 { + return nil, fmt.Errorf("direct source package installation has not been implemented") + } + operation.AppendAction(&FetchPackageAction{ IsDependency: false, RepositoryEntry: entry, diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index 1078be9..b3e011b 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -486,13 +486,13 @@ func (operation *BPMOperation) Execute(verbose, force bool) error { } // Compile source package - err = CompileSourcePackage(value.File, outputFilename, false) + outputBpmPackages, err := CompileSourcePackage(value.File, outputFilename, false) if err != nil { return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) } // Set values - fileToInstall = outputFilename + fileToInstall = outputBpmPackages[bpmpkg.PkgInfo.Name] bpmpkg, err = ReadPackage(outputFilename) if err != nil { return fmt.Errorf("could not read package (%s): %s\n", fileToInstall, err) diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 7f29197..fd48021 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -24,21 +24,22 @@ type BPMPackage struct { } type PackageInfo struct { - Name string `yaml:"name,omitempty"` - Description string `yaml:"description,omitempty"` - Version string `yaml:"version,omitempty"` - Revision int `yaml:"revision,omitempty"` - Url string `yaml:"url,omitempty"` - License string `yaml:"license,omitempty"` - Arch string `yaml:"architecture,omitempty"` - Type string `yaml:"type,omitempty"` - Keep []string `yaml:"keep,omitempty"` - Depends []string `yaml:"depends,omitempty"` - MakeDepends []string `yaml:"make_depends,omitempty"` - OptionalDepends []string `yaml:"optional_depends,omitempty"` - Conflicts []string `yaml:"conflicts,omitempty"` - Replaces []string `yaml:"replaces,omitempty"` - Provides []string `yaml:"provides,omitempty"` + Name string `yaml:"name,omitempty"` + Description string `yaml:"description,omitempty"` + Version string `yaml:"version,omitempty"` + Revision int `yaml:"revision,omitempty"` + Url string `yaml:"url,omitempty"` + License string `yaml:"license,omitempty"` + Arch string `yaml:"architecture,omitempty"` + Type string `yaml:"type,omitempty"` + Keep []string `yaml:"keep,omitempty"` + Depends []string `yaml:"depends,omitempty"` + MakeDepends []string `yaml:"make_depends,omitempty"` + OptionalDepends []string `yaml:"optional_depends,omitempty"` + Conflicts []string `yaml:"conflicts,omitempty"` + Replaces []string `yaml:"replaces,omitempty"` + Provides []string `yaml:"provides,omitempty"` + SplitPackages []*PackageInfo `yaml:"split_packages,omitempty"` } type PackageFileEntry struct { @@ -403,6 +404,7 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { Conflicts: make([]string, 0), Replaces: make([]string, 0), Provides: make([]string, 0), + SplitPackages: make([]*PackageInfo, 0), } err := yaml.Unmarshal([]byte(contents), &pkgInfo) if err != nil { @@ -460,6 +462,13 @@ func CreateReadableInfo(showArchitecture, showType, showPackageRelations bool, p appendArray("Provided packages", pkgInfo.Provides) appendArray("Replaces packages", pkgInfo.Replaces) } + if pkgInfo.Type == "source" && len(pkgInfo.SplitPackages) != 0 { + splitPkgs := make([]string, len(pkgInfo.SplitPackages)) + for i, splitPkgInfo := range pkgInfo.SplitPackages { + splitPkgs[i] = splitPkgInfo.Name + } + appendArray("Split Packages", splitPkgs) + } ret = append(ret, "Installation Reason: "+string(GetInstallationReason(pkgInfo.Name, rootDir))) return strings.Join(ret, "\n") } -- 2.47.2 From 903c7dce3e48e8e630c21c40f6315dd935ea0983 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 26 Apr 2025 16:20:40 +0300 Subject: [PATCH 12/33] Change -o flag from output filename to output directory --- src/bpm/main.go | 44 +++++++++++++++++++++------------------ src/bpmlib/compilation.go | 14 +++---------- src/bpmlib/operations.go | 7 +++---- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index 7560c24..77e2cf1 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -42,7 +42,7 @@ var doCleanup = false var showRepoInfo = false var installSrcPkgDepends = false var skipChecks = false -var outputFilename = "" +var outputDirectory = "" func main() { err := bpmlib.ReadConfig() @@ -642,36 +642,40 @@ func resolveCommand() { log.Fatalf("Error: could not get user home directory: %s", err) } - // Trim output filename - outputFilename = strings.TrimSpace(outputFilename) - if outputFilename != "/" { - outputFilename = strings.TrimSuffix(outputFilename, "/") + // Trim output directory + outputDirectory = strings.TrimSpace(outputDirectory) + if outputDirectory != "/" { + outputDirectory = strings.TrimSuffix(outputDirectory, "/") } - // Set output filename if empty - if outputFilename == "" { - outputFilename = path.Join(workdir, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) + // Set output directory if empty + if outputDirectory == "" { + outputDirectory = workdir } // Replace first tilde with user home directory - if strings.Split(outputFilename, "/")[0] == "~" { - outputFilename = strings.Replace(outputFilename, "~", homedir, 1) + if strings.Split(outputDirectory, "/")[0] == "~" { + outputDirectory = strings.Replace(outputDirectory, "~", homedir, 1) } - // Prepend current working directory to output filename if not an absolute path - if outputFilename != "" && !strings.HasPrefix(outputFilename, "/") { - outputFilename = filepath.Join(workdir, outputFilename) + // Prepend current working directory to output directory if not an absolute path + if outputDirectory != "" && !strings.HasPrefix(outputDirectory, "/") { + outputDirectory = filepath.Join(workdir, outputDirectory) } // Clean path - path.Clean(outputFilename) + path.Clean(outputDirectory) - // Append archive filename if path is set to a directory - if stat, err := os.Stat(outputFilename); err == nil && stat.IsDir() { - outputFilename = path.Join(outputFilename, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) + // Ensure output directory exists and is a directory + stat, err := os.Stat(outputDirectory) + if err != nil { + log.Fatalf("Error: could not stat output directory (%s): %s", outputDirectory, err) + } + if !stat.IsDir() { + log.Fatalf("Error: output directory (%s) is not a directory", outputDirectory) } - outputBpmPackages, err := bpmlib.CompileSourcePackage(sourcePackage, outputFilename, skipChecks) + outputBpmPackages, err := bpmlib.CompileSourcePackage(sourcePackage, outputDirectory, skipChecks) if err != nil { log.Fatalf("Error: could not compile source package (%s): %s", sourcePackage, err) } @@ -762,7 +766,7 @@ func printHelp() { fmt.Println(" -v Show additional information about what BPM is doing") fmt.Println(" -d installs required dependencies for package compilation") fmt.Println(" -s skips the check function in source.sh scripts") - fmt.Println(" -o sets output filename") + fmt.Println(" -o sets output directory") fmt.Println(" -y skips the confirmation prompt") fmt.Println("\033[1m----------------\033[0m") @@ -827,7 +831,7 @@ func resolveFlags() { compileFlagSet := flag.NewFlagSet("Compile flags", flag.ExitOnError) compileFlagSet.BoolVar(&installSrcPkgDepends, "d", false, "Install required dependencies for package compilation") compileFlagSet.BoolVar(&skipChecks, "s", false, "Skip the check function in source.sh scripts") - compileFlagSet.StringVar(&outputFilename, "o", "", "Set output filename") + compileFlagSet.StringVar(&outputDirectory, "o", "", "Set output directory") compileFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing") compileFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts") diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 370feb9..dcbd8ae 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -15,7 +15,7 @@ import ( var rootCompilationUID = "65534" var rootCompilationGID = "65534" -func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks bool) (outputBpmPackages map[string]string, err error) { +func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bool) (outputBpmPackages map[string]string, err error) { // Initialize map outputBpmPackages = make(map[string]string) @@ -326,16 +326,8 @@ func CompileSourcePackage(archiveFilename, outputFilename string, skipChecks boo return nil, err } - // Set output filename if split package - if len(bpmpkg.PkgInfo.SplitPackages) != 1 { - // Get current working directory - workdir, err := os.Getwd() - if err != nil { - return nil, fmt.Errorf("could not get working directory: %s", err) - } - - outputFilename = path.Join(workdir, fmt.Sprintf("%s-%s-%d.bpm", pkgInfo.Name, pkgInfo.Version, pkgInfo.Revision)) - } + // Set output filename + outputFilename := path.Join(outputDirectory, fmt.Sprintf("%s-%s-%d.bpm", pkgInfo.Name, pkgInfo.Version, pkgInfo.Revision)) // Move final BPM archive err = os.Rename(path.Join(tempDirectory, "final-archive.bpm"), outputFilename) diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index b3e011b..a78c6a7 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -473,9 +473,8 @@ func (operation *BPMOperation) Execute(verbose, force bool) error { // Compile package if type is 'source' if bpmpkg.PkgInfo.Type == "source" { - // Get path to compiled package directory and output filename + // Get path to compiled package directory compiledDir := path.Join(operation.RootDir, "/var/lib/bpm/compiled/") - outputFilename := path.Join(compiledDir, fmt.Sprintf("%s-%s-%d.bpm", bpmpkg.PkgInfo.Name, bpmpkg.PkgInfo.Version, bpmpkg.PkgInfo.Revision)) // Create compiled package directory if not exists if _, err := os.Stat(compiledDir); err != nil { @@ -486,14 +485,14 @@ func (operation *BPMOperation) Execute(verbose, force bool) error { } // Compile source package - outputBpmPackages, err := CompileSourcePackage(value.File, outputFilename, false) + outputBpmPackages, err := CompileSourcePackage(value.File, compiledDir, false) if err != nil { return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) } // Set values fileToInstall = outputBpmPackages[bpmpkg.PkgInfo.Name] - bpmpkg, err = ReadPackage(outputFilename) + bpmpkg, err = ReadPackage(fileToInstall) if err != nil { return fmt.Errorf("could not read package (%s): %s\n", fileToInstall, err) } -- 2.47.2 From 5776784021bbd7a36f7726c4ea47faed3fe34f46 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 26 Apr 2025 16:23:09 +0300 Subject: [PATCH 13/33] Remove no longer used flags from help message --- src/bpm/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index 77e2cf1..e44c0e8 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -729,12 +729,11 @@ func printHelp() { fmt.Println(" -c lists the amount of installed packages") fmt.Println(" -n lists only the names of installed packages") fmt.Println("-> bpm search | Searches for packages through declared repositories") - fmt.Println("-> bpm install [-R, -v, -y, -f, -o, -c, -b, -k, --reinstall, --reinstall-all, --no-optional, --installation-reason] | installs the following files") + fmt.Println("-> bpm install [-R, -v, -y, -f, --reinstall, --reinstall-all, --no-optional, --installation-reason] | installs the following files") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -v Show additional information about what BPM is doing") fmt.Println(" -y skips the confirmation prompt") fmt.Println(" -f skips dependency, conflict and architecture checking") - fmt.Println(" -k keeps the compilation directory created by BPM after source package installation") fmt.Println(" --reinstall Reinstalls packages even if they do not have a newer version available") fmt.Println(" --reinstall-all Same as --reinstall but also reinstalls dependencies") fmt.Println(" --no-optional Prevents installation of optional dependencies") -- 2.47.2 From c425b263fe7b526fd405b07dfced99d8ec8ab9c8 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 26 Apr 2025 16:28:24 +0300 Subject: [PATCH 14/33] Fix cleanup flags not being read --- src/bpm/main.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bpm/main.go b/src/bpm/main.go index e44c0e8..c34eb84 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -876,6 +876,12 @@ func resolveFlags() { return } subcommandArgs = removeFlagSet.Args() + } else if getCommandType() == cleanup { + err := cleanupFlagSet.Parse(subcommandArgs) + if err != nil { + return + } + subcommandArgs = cleanupFlagSet.Args() } else if getCommandType() == file { err := fileFlagSet.Parse(subcommandArgs) if err != nil { -- 2.47.2 From b1bb8de6611f76c3bbab109c141e966fbda0487f Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 27 Apr 2025 12:04:30 +0300 Subject: [PATCH 15/33] Fix packages not compiling without root permissions --- src/bpmlib/compilation.go | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index dcbd8ae..caa6075 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -144,8 +144,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + if os.Getuid() == 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + } err = cmd.Run() if err != nil { return nil, err @@ -163,8 +165,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + if os.Getuid() == 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + } err = cmd.Run() if err != nil { return nil, err @@ -221,8 +225,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + if os.Getuid() == 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + } err = cmd.Run() if err != nil { return nil, err @@ -234,8 +240,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Env = env - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + if os.Getuid() == 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + } err = cmd.Run() if err != nil { return nil, fmt.Errorf("files.tar.gz archive could not be created: %s", err) @@ -313,8 +321,10 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo return nil, err } cmd.Env = append(env, "CURRENT_DIR="+currentDir) - cmd.SysProcAttr = &syscall.SysProcAttr{} - cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + if os.Getuid() == 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{} + cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)} + } err = cmd.Run() if err != nil { return nil, fmt.Errorf("BPM archive could not be created: %s", err) -- 2.47.2 From d8a42c780d4dc20ce1943d5198427fca1bbe78ac Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 1 May 2025 16:40:42 +0300 Subject: [PATCH 16/33] Allow direct split source package installation through local BPM archive --- src/bpmlib/compilation.go | 31 ++---------------- src/bpmlib/general.go | 27 +++++++++++++--- src/bpmlib/operations.go | 34 +++++++++++++++----- src/bpmlib/packages.go | 66 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 112 insertions(+), 46 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index caa6075..7e7ce31 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -175,21 +175,17 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo } } - // Variable that will be used later - isSplitPkg := true - // Get all packages to compile packagesToCompile := bpmpkg.PkgInfo.SplitPackages - if len(packagesToCompile) == 0 { + if !bpmpkg.PkgInfo.IsSplitPackage() { packagesToCompile = append(packagesToCompile, bpmpkg.PkgInfo) - isSplitPkg = false } // Compile each package for _, pkg := range packagesToCompile { // Get package function name packageFunctionName := "package" - if isSplitPkg { + if bpmpkg.PkgInfo.IsSplitPackage() { packageFunctionName = "package_" + pkg.Name } @@ -250,28 +246,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo } // Clone source package info - var pkgInfo PackageInfo - if !isSplitPkg { - pkgInfo = *bpmpkg.PkgInfo - } else { - pkgInfo = *pkg - - // Ensure required fields are set - if strings.TrimSpace(pkgInfo.Name) == "" { - return nil, fmt.Errorf("split package name is empty") - } - - // Copy data from main source package - if pkgInfo.Description == "" { - pkgInfo.Description = bpmpkg.PkgInfo.Description - } - pkgInfo.Version = bpmpkg.PkgInfo.Version - pkgInfo.Revision = bpmpkg.PkgInfo.Revision - pkgInfo.Url = bpmpkg.PkgInfo.Url - if pkgInfo.License == "" { - pkgInfo.License = bpmpkg.PkgInfo.License - } - } + pkgInfo := *pkg // Set package type to binary pkgInfo.Type = "binary" diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index 4c7657a..c9cc1bd 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -25,6 +25,7 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein Changes: make(map[string]string), RootDir: rootDir, ForceInstallationReason: installationReason, + compiledPackages: make(map[string]string), } // Resolve packages @@ -35,12 +36,25 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein if err != nil { return nil, fmt.Errorf("could not read package: %s", err) } - if reinstallMethod == ReinstallMethodNone && IsPackageInstalled(bpmpkg.PkgInfo.Name, rootDir) && GetPackageInfo(bpmpkg.PkgInfo.Name, rootDir).GetFullVersion() == bpmpkg.PkgInfo.GetFullVersion() { + + if bpmpkg.PkgInfo.Type == "source" && bpmpkg.PkgInfo.IsSplitPackage() { + for _, splitPkg := range bpmpkg.PkgInfo.SplitPackages { + if reinstallMethod == ReinstallMethodNone && IsPackageInstalled(splitPkg.Name, rootDir) && GetPackageInfo(splitPkg.Name, rootDir).GetFullVersion() == splitPkg.GetFullVersion() { + continue + } + + operation.AppendAction(&InstallPackageAction{ + File: pkg, + IsDependency: false, + BpmPackage: bpmpkg, + SplitPackageToInstall: splitPkg.Name, + }) + } continue } - if bpmpkg.PkgInfo.Type == "source" && len(bpmpkg.PkgInfo.SplitPackages) != 0 { - return nil, fmt.Errorf("direct source package installation has not been implemented") + if reinstallMethod == ReinstallMethodNone && IsPackageInstalled(bpmpkg.PkgInfo.Name, rootDir) && GetPackageInfo(bpmpkg.PkgInfo.Name, rootDir).GetFullVersion() == bpmpkg.PkgInfo.GetFullVersion() { + continue } operation.AppendAction(&InstallPackageAction{ @@ -69,8 +83,8 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein continue } - if entry.Info.Type == "source" && len(entry.Info.SplitPackages) != 0 { - return nil, fmt.Errorf("direct source package installation has not been implemented") + if entry.Info.IsSplitPackage() { + return nil, fmt.Errorf("direct split source package installation has not been implemented") } operation.AppendAction(&FetchPackageAction{ @@ -128,6 +142,7 @@ func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencie UnresolvedDepends: make([]string, 0), Changes: make(map[string]string), RootDir: rootDir, + compiledPackages: make(map[string]string), } // Search for packages @@ -164,6 +179,7 @@ func CleanupPackages(rootDir string, verbose bool) (operation *BPMOperation, err UnresolvedDepends: make([]string, 0), Changes: make(map[string]string), RootDir: rootDir, + compiledPackages: make(map[string]string), } // Do package cleanup @@ -206,6 +222,7 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci Changes: make(map[string]string), RootDir: rootDir, ForceInstallationReason: InstallationReasonUnknown, + compiledPackages: make(map[string]string), } // Search for packages diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index a78c6a7..efb5a04 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -16,6 +16,7 @@ type BPMOperation struct { Changes map[string]string RootDir string ForceInstallationReason InstallationReason + compiledPackages map[string]string } func (operation *BPMOperation) ActionsContainPackage(pkg string) bool { @@ -337,6 +338,9 @@ func (operation *BPMOperation) ShowOperationSummary() { var pkgInfo *PackageInfo if value.GetActionType() == "install" { pkgInfo = value.(*InstallPackageAction).BpmPackage.PkgInfo + if value.(*InstallPackageAction).SplitPackageToInstall != "" { + pkgInfo = pkgInfo.GetSplitPackageInfo(value.(*InstallPackageAction).SplitPackageToInstall) + } } else if value.GetActionType() == "fetch" { pkgInfo = value.(*FetchPackageAction).RepositoryEntry.Info } else { @@ -484,14 +488,27 @@ func (operation *BPMOperation) Execute(verbose, force bool) error { } } - // Compile source package - outputBpmPackages, err := CompileSourcePackage(value.File, compiledDir, false) - if err != nil { - return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) + // Get package name to install + pkgNameToInstall := bpmpkg.PkgInfo.Name + if bpmpkg.PkgInfo.IsSplitPackage() { + pkgNameToInstall = value.SplitPackageToInstall + } + + // Compile source package if not compiled already + if _, ok := operation.compiledPackages[pkgNameToInstall]; !ok { + outputBpmPackages, err := CompileSourcePackage(value.File, compiledDir, false) + if err != nil { + return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) + } + + // Add compiled packages to slice + for pkgName, pkgFile := range outputBpmPackages { + operation.compiledPackages[pkgName] = pkgFile + } } // Set values - fileToInstall = outputBpmPackages[bpmpkg.PkgInfo.Name] + fileToInstall = operation.compiledPackages[pkgNameToInstall] bpmpkg, err = ReadPackage(fileToInstall) if err != nil { return fmt.Errorf("could not read package (%s): %s\n", fileToInstall, err) @@ -530,9 +547,10 @@ type OperationAction interface { } type InstallPackageAction struct { - File string - IsDependency bool - BpmPackage *BPMPackage + File string + IsDependency bool + SplitPackageToInstall string + BpmPackage *BPMPackage } func (action *InstallPackageAction) GetActionType() string { diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index fd48021..6e510a8 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -70,6 +70,25 @@ func (pkgInfo *PackageInfo) GetFullVersion() string { return pkgInfo.Version + "-" + strconv.Itoa(pkgInfo.Revision) } +func (pkgInfo *PackageInfo) IsSplitPackage() bool { + // Return false if not a source package + if pkgInfo.Type != "source" { + return false + } + + return len(pkgInfo.SplitPackages) > 0 +} + +func (pkgInfo *PackageInfo) GetSplitPackageInfo(splitPkg string) *PackageInfo { + for _, splitPkgInfo := range pkgInfo.SplitPackages { + if splitPkgInfo.Name == splitPkg { + return splitPkgInfo + } + } + + return nil +} + type InstallationReason string const ( @@ -149,7 +168,6 @@ func ReadPackage(filename string) (*BPMPackage, error) { var pkgFiles []*PackageFileEntry if _, err := os.Stat(filename); os.IsNotExist(err) { - fmt.Println("a") return nil, err } @@ -388,7 +406,7 @@ func executePackageScripts(filename, rootDir string, operation packageOperation, } func ReadPackageInfo(contents string) (*PackageInfo, error) { - pkgInfo := PackageInfo{ + pkgInfo := &PackageInfo{ Name: "", Description: "", Version: "", @@ -410,6 +428,8 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { if err != nil { return nil, err } + + // Ensure required fields are set properly if pkgInfo.Name == "" { return nil, errors.New("this package contains no name") } else if pkgInfo.Description == "" { @@ -423,10 +443,46 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { } else if pkgInfo.Type == "" { return nil, errors.New("this package contains no type") } - for i := 0; i < len(pkgInfo.Keep); i++ { - pkgInfo.Keep[i] = strings.TrimPrefix(pkgInfo.Keep[i], "/") + for _, val := range pkgInfo.Keep { + if strings.HasPrefix(val, "/") { + return nil, fmt.Errorf("cannot keep file (%s) after update because it starts with a slash", val) + } } - return &pkgInfo, nil + + // Setup split package information + for i, splitPkg := range pkgInfo.SplitPackages { + // Ensure split package contains a name and one that is different from the main package name + if splitPkg.Name == "" || splitPkg.Name == pkgInfo.Name { + return nil, fmt.Errorf("invalid split package name: %s", splitPkg.Name) + } + + // Turn split package into json data + splitPkgJson, err := yaml.Marshal(splitPkg) + if err != nil { + return nil, err + } + + // Clone all main package fields onto split package + pkgInfoClone := *pkgInfo + pkgInfo.SplitPackages[i] = &pkgInfoClone + + // Set make depends and split package field of split package to nil + pkgInfo.SplitPackages[i].MakeDepends = nil + pkgInfo.SplitPackages[i].SplitPackages = nil + + // Unmarshal json data back to struct + err = yaml.Unmarshal(splitPkgJson, &pkgInfo.SplitPackages[i]) + if err != nil { + return nil, err + } + + // Force set split package version, revision and URL + pkgInfo.SplitPackages[i].Version = pkgInfo.Version + pkgInfo.SplitPackages[i].Revision = pkgInfo.Revision + pkgInfo.SplitPackages[i].Url = pkgInfo.Url + } + + return pkgInfo, nil } func CreateReadableInfo(showArchitecture, showType, showPackageRelations bool, pkgInfo *PackageInfo, rootDir string) string { -- 2.47.2 From 2e416b9e6f96f485e40b3b9688f36b2131346175 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 2 May 2025 20:43:24 +0300 Subject: [PATCH 17/33] Allow direct split source package installation through repository entries --- src/bpmlib/general.go | 4 --- src/bpmlib/operations.go | 64 ++++++++++++++++++++++++++++++-------- src/bpmlib/repositories.go | 52 +++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 20 deletions(-) diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index c9cc1bd..1d8b05a 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -83,10 +83,6 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein continue } - if entry.Info.IsSplitPackage() { - return nil, fmt.Errorf("direct split source package installation has not been implemented") - } - operation.AppendAction(&FetchPackageAction{ IsDependency: false, RepositoryEntry: entry, diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index efb5a04..1736545 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -413,30 +413,68 @@ func (operation *BPMOperation) RunHooks(verbose bool) error { return nil } -func (operation *BPMOperation) Execute(verbose, force bool) error { +func (operation *BPMOperation) Execute(verbose, force bool) (err 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...") + + // Create map for fetched packages + fetchedPackages := make(map[string]string) + for i, action := range operation.Actions { if action.GetActionType() != "fetch" { continue } + + // Get repository entry 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)) + + // Create bpmpkg variable + var bpmpkg *BPMPackage + + // Check if package has already been fetched from download link + if _, ok := fetchedPackages[entry.Download]; !ok { + // Fetch package from repository + 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)) + } + + // Read fetched package + bpmpkg, err = ReadPackage(fetchedPackage) + if err != nil { + return errors.New(fmt.Sprintf("could not fetch package (%s): %s\n", entry.Info.Name, err)) + } + + // Add fetched package to map + fetchedPackages[entry.Download] = fetchedPackage + + fmt.Printf("Package (%s) was successfully fetched!\n", entry.Info.Name) + } else { + // Read fetched package + bpmpkg, err = ReadPackage(fetchedPackages[entry.Download]) + if err != nil { + return errors.New(fmt.Sprintf("could not read package (%s): %s\n", entry.Info.Name, err)) + } + + fmt.Printf("Package (%s) was successfully fetched!\n", entry.Info.Name) } - 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, + + if bpmpkg.PkgInfo.IsSplitPackage() { + operation.Actions[i] = &InstallPackageAction{ + File: fetchedPackages[entry.Download], + IsDependency: action.(*FetchPackageAction).IsDependency, + BpmPackage: bpmpkg, + SplitPackageToInstall: entry.Info.Name, + } + } else { + operation.Actions[i] = &InstallPackageAction{ + File: fetchedPackages[entry.Download], + IsDependency: action.(*FetchPackageAction).IsDependency, + BpmPackage: bpmpkg, + } } } } diff --git a/src/bpmlib/repositories.go b/src/bpmlib/repositories.go index c74e440..c168f79 100644 --- a/src/bpmlib/repositories.go +++ b/src/bpmlib/repositories.go @@ -73,10 +73,56 @@ func (repo *Repository) ReadLocalDatabase() error { return err } - for _, p := range entry.Info.Provides { - repo.VirtualPackages[p] = append(repo.VirtualPackages[p], entry.Info.Name) + // Create repository entries + if entry.Info.IsSplitPackage() { + for _, splitPkg := range entry.Info.SplitPackages { + // Turn split package into json data + splitPkgJson, err := yaml.Marshal(splitPkg) + if err != nil { + return err + } + + // Clone all main package fields onto split package + splitPkgClone := *entry.Info + + // Set split package field of split package to nil + splitPkgClone.SplitPackages = nil + + // Unmarshal json data back to struct + err = yaml.Unmarshal(splitPkgJson, &splitPkgClone) + if err != nil { + return err + } + + // Force set split package version, revision and URL + splitPkgClone.Version = entry.Info.Version + splitPkgClone.Revision = entry.Info.Revision + splitPkgClone.Url = entry.Info.Url + + // Create entry for split package + repo.Entries[splitPkg.Name] = &RepositoryEntry{ + Info: &splitPkgClone, + Download: entry.Download, + DownloadSize: entry.DownloadSize, + InstalledSize: 0, + Repository: repo, + } + + // Add virtual packages to repository + for _, p := range splitPkg.Provides { + repo.VirtualPackages[p] = append(repo.VirtualPackages[p], splitPkg.Name) + } + } + } else { + // Create entry for package + repo.Entries[entry.Info.Name] = &entry + + // Add virtual packages to repository + for _, p := range entry.Info.Provides { + repo.VirtualPackages[p] = append(repo.VirtualPackages[p], entry.Info.Name) + } } - repo.Entries[entry.Info.Name] = &entry + } return nil -- 2.47.2 From 4f1eeeb11d5a6782301a5cf702a3df6ed8fe1b3d Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 2 May 2025 21:20:56 +0300 Subject: [PATCH 18/33] Fix dependency installation command arguments for 'bpm compile -d' --- src/bpm/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index c34eb84..7d49cb8 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -609,7 +609,9 @@ func resolveCommand() { } // Run 'bpm install' using the set privilege escalator command - cmd := exec.Command(bpmlib.BPMConfig.PrivilegeEscalatorCmd, executable, "install", "--installation-reason=dependency", strings.Join(unmetDepends, " ")) + args := []string{executable, "install", "--installation-reason=dependency"} + args = append(args, unmetDepends...) + cmd := exec.Command(bpmlib.BPMConfig.PrivilegeEscalatorCmd, args...) if yesAll { cmd.Args = slices.Insert(cmd.Args, 3, "-y") } -- 2.47.2 From eb8db1bc9915ec886e55ce9890cead9f63fb2913 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 2 May 2025 21:29:07 +0300 Subject: [PATCH 19/33] Fix output filename for source package compilation --- src/bpmlib/compilation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 7e7ce31..0b11f3b 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -312,7 +312,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo } // Set output filename - outputFilename := path.Join(outputDirectory, fmt.Sprintf("%s-%s-%d.bpm", pkgInfo.Name, pkgInfo.Version, pkgInfo.Revision)) + outputFilename := path.Join(outputDirectory, fmt.Sprintf("%s-%s-%d-%s.bpm", pkgInfo.Name, pkgInfo.Version, pkgInfo.Revision, pkgInfo.Arch)) // Move final BPM archive err = os.Rename(path.Join(tempDirectory, "final-archive.bpm"), outputFilename) -- 2.47.2 From 4a8c4e22ec96201e585a03c3ac3643e5ef56a2d0 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 3 May 2025 10:47:32 +0300 Subject: [PATCH 20/33] Move directories --- src/bpmlib/compilation.go | 8 +++++++- src/bpmlib/operations.go | 2 +- src/bpmlib/repositories.go | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 0b11f3b..6e72b2c 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -60,7 +60,13 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo gid = os.Getgid() } - tempDirectory := path.Join(homeDir, ".cache/bpm/compilation/", bpmpkg.PkgInfo.Name) + // Set temporary directory + var tempDirectory string + if os.Getuid() == 0 { + tempDirectory = path.Join("/var/cache/bpm/compilation/", bpmpkg.PkgInfo.Name) + } else { + tempDirectory = path.Join(homeDir, ".cache/bpm/compilation/", bpmpkg.PkgInfo.Name) + } // Ensure temporary directory does not exist if _, err := os.Stat(tempDirectory); err == nil { diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index 1736545..0a3648b 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -516,7 +516,7 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { // Compile package if type is 'source' if bpmpkg.PkgInfo.Type == "source" { // Get path to compiled package directory - compiledDir := path.Join(operation.RootDir, "/var/lib/bpm/compiled/") + compiledDir := path.Join(operation.RootDir, "/var/cache/bpm/compiled/") // Create compiled package directory if not exists if _, err := os.Stat(compiledDir); err != nil { diff --git a/src/bpmlib/repositories.go b/src/bpmlib/repositories.go index c168f79..cafc6b1 100644 --- a/src/bpmlib/repositories.go +++ b/src/bpmlib/repositories.go @@ -266,16 +266,16 @@ func (repo *Repository) FetchPackage(pkg string) (string, error) { } defer resp.Body.Close() - err = os.MkdirAll("/var/cache/bpm/packages/", 0755) + err = os.MkdirAll("/var/cache/bpm/fetched/", 0755) if err != nil { return "", err } - out, err := os.Create("/var/cache/bpm/packages/" + path.Base(entry.Download)) + out, err := os.Create("/var/cache/bpm/fetched/" + path.Base(entry.Download)) if err != nil { return "", err } defer out.Close() _, err = io.Copy(out, resp.Body) - return "/var/cache/bpm/packages/" + path.Base(entry.Download), nil + return "/var/cache/bpm/fetched/" + path.Base(entry.Download), nil } -- 2.47.2 From 132910981052d81491a347884319421558b673bc Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 3 May 2025 12:38:29 +0300 Subject: [PATCH 21/33] Add cache cleanup to 'cleanup' subcommand --- README.md | 2 +- src/bpm/main.go | 105 ++++++++++++++++++++++++++---------------- src/bpmlib/general.go | 83 +++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 231a717..d49f03b 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ You can remove an installed package by typing the following bpm remove package_name ``` -To remove all unused dependencies try using the cleanup command +To remove all unused dependencies and clean cached files try using the cleanup command ```sh bpm cleanup ``` diff --git a/src/bpm/main.go b/src/bpm/main.go index 7d49cb8..92274de 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -43,6 +43,10 @@ var showRepoInfo = false var installSrcPkgDepends = false var skipChecks = false var outputDirectory = "" +var cleanupDependencies = false +var cleanupCompilationFiles = false +var cleanupCompiledPackages = false +var cleanupFetchedPackages = false func main() { err := bpmlib.ReadConfig() @@ -456,51 +460,58 @@ func resolveCommand() { log.Fatalf("Error: this subcommand needs to be run with superuser permissions") } - // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.CleanupCache(rootDir, cleanupCompilationFiles, cleanupCompiledPackages, cleanupFetchedPackages, verbose) if err != nil { - log.Fatalf("Error: could not read local databases: %s", err) + log.Fatalf("Error: could not complete cache cleanup: %s", err) } - // Create cleanup operation - operation, err := bpmlib.CleanupPackages(rootDir, verbose) - if errors.As(err, &bpmlib.PackageNotFoundErr{}) || errors.As(err, &bpmlib.DependencyNotFoundErr{}) || errors.As(err, &bpmlib.PackageConflictErr{}) { - log.Fatalf("Error: %s", err) - } else if err != nil { - log.Fatalf("Error: could not setup operation: %s\n", err) - } - - // Exit if operation contains no actions - if len(operation.Actions) == 0 { - fmt.Println("No action needs to be taken") - return - } - - // 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) - text, _ := reader.ReadString('\n') - if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" { - fmt.Println("Cancelling package removal...") - os.Exit(1) + if cleanupDependencies { + // Read local databases + err := bpmlib.ReadLocalDatabases() + if err != nil { + log.Fatalf("Error: could not read local databases: %s", err) } - } - // Execute operation - err = operation.Execute(verbose, force) - if err != nil { - log.Fatalf("Error: could not complete operation: %s\n", err) - } + // Create cleanup operation + operation, err := bpmlib.CleanupPackages(rootDir, verbose) + if errors.As(err, &bpmlib.PackageNotFoundErr{}) || errors.As(err, &bpmlib.DependencyNotFoundErr{}) || errors.As(err, &bpmlib.PackageConflictErr{}) { + log.Fatalf("Error: %s", err) + } else if err != nil { + log.Fatalf("Error: could not setup operation: %s\n", err) + } - // Executing hooks - fmt.Println("Running hooks...") - err = operation.RunHooks(verbose) - if err != nil { - log.Fatalf("Error: could not run hooks: %s\n", err) + // Exit if operation contains no actions + if len(operation.Actions) == 0 { + fmt.Println("No action needs to be taken") + return + } + + // 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) + text, _ := reader.ReadString('\n') + if strings.TrimSpace(strings.ToLower(text)) != "y" && strings.TrimSpace(strings.ToLower(text)) != "yes" { + fmt.Println("Cancelling package removal...") + os.Exit(1) + } + } + + // Execute operation + err = operation.Execute(verbose, force) + if err != nil { + log.Fatalf("Error: could not complete operation: %s\n", err) + } + + // Executing hooks + fmt.Println("Running hooks...") + err = operation.RunHooks(verbose) + if err != nil { + log.Fatalf("Error: could not run hooks: %s\n", err) + } } case file: files := subcommandArgs @@ -757,10 +768,14 @@ func printHelp() { fmt.Println(" -y skips the confirmation prompt") fmt.Println(" --unused removes only packages that aren't required as dependencies by other packages") fmt.Println(" --cleanup performs a dependency cleanup") - fmt.Println("-> bpm cleanup [-R, -v, -y] | remove all unused dependency packages") + fmt.Println("-> bpm cleanup [-R, -v, -y, --depends, --compilation-files, --compiled-pkgs, --fetched-pkgs] | remove all unused dependencies and cache directories") fmt.Println(" -v Show additional information about what BPM is doing") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -y skips the confirmation prompt") + fmt.Println(" --depends performs a dependency cleanup") + fmt.Println(" --compilation-files performs a cleanup of compilation files") + fmt.Println(" --compiled-pkgs performs a cleanup of compilation compiled binary packages") + fmt.Println(" --fetched-pkgs performs a cleanup of fetched packages from repositories") fmt.Println("-> bpm file [-R] | shows what packages the following packages are managed by") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println("-> bpm compile [-d, -s, -o] | Compile source BPM package") @@ -823,6 +838,10 @@ func resolveFlags() { cleanupFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root") cleanupFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing") cleanupFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts") + cleanupFlagSet.BoolVar(&cleanupDependencies, "depends", false, "Perform a dependency cleanup") + cleanupFlagSet.BoolVar(&cleanupCompilationFiles, "compilation-files", false, "Perform a cleanup of compilation files") + cleanupFlagSet.BoolVar(&cleanupCompiledPackages, "compiled-pkgs", false, "Perform a cleanup of compilation compiled binary packages") + cleanupFlagSet.BoolVar(&cleanupFetchedPackages, "fetched-pkgs", false, "Perform a cleanup of fetched packages from repositories") cleanupFlagSet.Usage = printHelp // File flags fileFlagSet := flag.NewFlagSet("Remove flags", flag.ExitOnError) @@ -883,6 +902,12 @@ func resolveFlags() { if err != nil { return } + if !cleanupDependencies && !cleanupCompilationFiles && !cleanupCompiledPackages && !cleanupFetchedPackages { + cleanupDependencies = true + cleanupCompilationFiles = true + cleanupCompiledPackages = true + cleanupFetchedPackages = true + } subcommandArgs = cleanupFlagSet.Args() } else if getCommandType() == file { err := fileFlagSet.Parse(subcommandArgs) diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index 1d8b05a..8e4fcbe 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "os" + "path" "slices" ) @@ -187,6 +188,88 @@ func CleanupPackages(rootDir string, verbose bool) (operation *BPMOperation, err return operation, nil } +func CleanupCache(rootDir string, cleanupCompilationFiles, cleanupCompiledPackages, cleanupFetchedPackages, verbose bool) error { + if cleanupCompilationFiles { + globalCompilationCacheDir := path.Join(rootDir, "var/cache/bpm/compilation") + + // Ensure path exists and is a directory + if stat, err := os.Stat(globalCompilationCacheDir); err == nil && stat.IsDir() { + // Delete directory + if verbose { + log.Printf("Removing directory (%s)\n", globalCompilationCacheDir) + } + err = os.RemoveAll(globalCompilationCacheDir) + if err != nil { + return err + } + } + + // Get home directories of users in root directory + homeDirs, err := os.ReadDir(path.Join(rootDir, "home")) + if err != nil { + return err + } + + // Loop through all home directories + for _, homeDir := range homeDirs { + // Skip if not a directory + if !homeDir.IsDir() { + continue + } + + localCompilationDir := path.Join(rootDir, "home", homeDir.Name(), ".cache/bpm/compilation") + + // Ensure path exists and is a directory + if stat, err := os.Stat(localCompilationDir); err != nil || !stat.IsDir() { + continue + } + + // Delete directory + if verbose { + log.Printf("Removing directory (%s)\n", localCompilationDir) + } + err = os.RemoveAll(localCompilationDir) + if err != nil { + return err + } + } + } + + if cleanupCompiledPackages { + dirToRemove := path.Join(rootDir, "var/cache/bpm/compiled") + + // Ensure path exists and is a directory + if stat, err := os.Stat(dirToRemove); err == nil && stat.IsDir() { + // Delete directory + if verbose { + log.Printf("Removing directory (%s)\n", dirToRemove) + } + err = os.RemoveAll(dirToRemove) + if err != nil { + return err + } + } + } + + if cleanupFetchedPackages { + dirToRemove := path.Join(rootDir, "var/cache/bpm/fetched") + + // Ensure path exists and is a directory + if stat, err := os.Stat(dirToRemove); err == nil && stat.IsDir() { + // Delete directory + if verbose { + log.Printf("Removing directory (%s)\n", dirToRemove) + } + err = os.RemoveAll(dirToRemove) + if err != nil { + return err + } + } + } + + return nil +} + // UpdatePackages fetches the newest versions of all installed packages from func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependencies, forceInstallation, verbose bool) (operation *BPMOperation, err error) { // Sync repositories -- 2.47.2 From b07df8c7df53d089367fcc657ce2bdbb1a6a6f70 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 3 May 2025 17:30:27 +0300 Subject: [PATCH 22/33] 'compile' subcommand will now detect if virtual package is installed --- src/bpm/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bpm/main.go b/src/bpm/main.go index 92274de..88b581d 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -608,6 +608,8 @@ func resolveCommand() { for i := len(unmetDepends) - 1; i >= 0; i-- { if slices.Contains(installedPackages, unmetDepends[i]) { unmetDepends = append(unmetDepends[:i], unmetDepends[i+1:]...) + } else if ok, _ := bpmlib.IsVirtualPackage(unmetDepends[i], rootDir); ok { + unmetDepends = append(unmetDepends[:i], unmetDepends[i+1:]...) } } -- 2.47.2 From a32dfba54a8f17db1ea7baff417a8374a7f71eaa Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 4 May 2025 21:03:05 +0300 Subject: [PATCH 23/33] Allow split package to have same name as main package --- src/bpmlib/packages.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 6e510a8..f1e8275 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -451,8 +451,8 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { // Setup split package information for i, splitPkg := range pkgInfo.SplitPackages { - // Ensure split package contains a name and one that is different from the main package name - if splitPkg.Name == "" || splitPkg.Name == pkgInfo.Name { + // Ensure split package contains a name + if splitPkg.Name == "" { return nil, fmt.Errorf("invalid split package name: %s", splitPkg.Name) } -- 2.47.2 From f0709ff410ed80cb2d3303f1b226ded5b4baf032 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 8 May 2025 12:44:55 +0300 Subject: [PATCH 24/33] Fix 'prepare' function running in source directory during compilation --- src/bpmlib/compilation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index 6e72b2c..f35b431 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -143,7 +143,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo "set -a\n"+ // Source and export functions and variables in source.sh script ". \"${BPM_WORKDIR}\"/source.sh\n"+ "set +a\n"+ - "[[ $(type -t prepare) == \"function\" ]] && { echo \"Running prepare() function\"; bash -e -c 'cd \"$BPM_SOURCE\" && prepare' || exit 1; }\n"+ // Run prepare() function if it exists + "[[ $(type -t prepare) == \"function\" ]] && { echo \"Running prepare() function\"; bash -e -c 'cd \"$BPM_WORKDIR\" && prepare' || exit 1; }\n"+ // Run prepare() function if it exists "[[ $(type -t build) == \"function\" ]] && { echo \"Running build() function\"; bash -e -c 'cd \"$BPM_SOURCE\" && build' || exit 1; }\n"+ // Run build() function if it exists "exit 0") cmd.Dir = tempDirectory -- 2.47.2 From 97d5a06ce7628fe1024d97b8655a018a11f8110e Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 8 May 2025 15:12:06 +0300 Subject: [PATCH 25/33] Remove force setting of URL field in split packages --- src/bpmlib/packages.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index f1e8275..503830b 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -476,10 +476,9 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { return nil, err } - // Force set split package version, revision and URL + // Force set split package version, revision pkgInfo.SplitPackages[i].Version = pkgInfo.Version pkgInfo.SplitPackages[i].Revision = pkgInfo.Revision - pkgInfo.SplitPackages[i].Url = pkgInfo.Url } return pkgInfo, nil -- 2.47.2 From f2bc7c8968b4fa9a16ffcd2fc1060621a0fa9d3c Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 9 May 2025 14:36:08 +0300 Subject: [PATCH 26/33] Fix not reading local databases after reloading config during package update --- src/bpmlib/general.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index 8e4fcbe..b63ec52 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -281,12 +281,16 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci if verbose { fmt.Println("All package databases synced successfully!") } - } - // Reload config and local databases - err = ReadConfig() - if err != nil { - return nil, fmt.Errorf("could not read BPM config: %s", err) + // Reload config and local databases + err = ReadConfig() + if err != nil { + return nil, fmt.Errorf("could not read BPM config: %s", err) + } + err = ReadLocalDatabases() + if err != nil { + return nil, fmt.Errorf("could not read local databases: %s", err) + } } // Get installed packages and check for updates -- 2.47.2 From 5f03a6a1ad9b5b1911bcabfde26591ba7e230077 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 13 May 2025 20:26:55 +0300 Subject: [PATCH 27/33] Redo dependency resolution and cache installed package information --- src/bpm/main.go | 4 +- src/bpmlib/dependencies.go | 164 ++++++++++++++++ src/bpmlib/general.go | 4 +- src/bpmlib/hooks.go | 2 +- src/bpmlib/installed_packages.go | 243 ++++++++++++++++++++++++ src/bpmlib/operations.go | 10 +- src/bpmlib/packages.go | 312 +------------------------------ 7 files changed, 420 insertions(+), 319 deletions(-) create mode 100644 src/bpmlib/dependencies.go create mode 100644 src/bpmlib/installed_packages.go diff --git a/src/bpm/main.go b/src/bpm/main.go index 88b581d..92b4dd8 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -547,7 +547,7 @@ func resolveCommand() { var pkgList []string for _, pkg := range pkgs { - if slices.ContainsFunc(bpmlib.GetPackageFiles(pkg, rootDir), func(entry *bpmlib.PackageFileEntry) bool { + if slices.ContainsFunc(bpmlib.GetPackage(pkg, rootDir).PkgFiles, func(entry *bpmlib.PackageFileEntry) bool { return entry.Path == absFile }) { pkgList = append(pkgList, pkg) @@ -593,7 +593,7 @@ func resolveCommand() { // Get direct runtime and make dependencies totalDepends := make([]string, 0) - for _, depend := range bpmpkg.PkgInfo.GetAllDependencies(true, false) { + for _, depend := range bpmpkg.PkgInfo.GetDependencies(true, false) { if !slices.Contains(totalDepends, depend) { totalDepends = append(totalDepends, depend) } diff --git a/src/bpmlib/dependencies.go b/src/bpmlib/dependencies.go new file mode 100644 index 0000000..d71a105 --- /dev/null +++ b/src/bpmlib/dependencies.go @@ -0,0 +1,164 @@ +package bpmlib + +import ( + "errors" + "fmt" + "slices" +) + +func (pkgInfo *PackageInfo) GetDependencies(includeMakeDepends, includeOptionalDepends bool) []string { + allDepends := make([]string, 0) + allDepends = append(allDepends, pkgInfo.Depends...) + if includeMakeDepends { + allDepends = append(allDepends, pkgInfo.MakeDepends...) + } + if includeOptionalDepends { + allDepends = append(allDepends, pkgInfo.OptionalDepends...) + } + return allDepends +} + +func (pkgInfo *PackageInfo) GetAllDependencies(includeMakeDepends, includeOptionalDepends bool, rootDir string) (resolved []string) { + // Initialize slices + resolved = make([]string, 0) + unresolved := make([]string, 0) + + // Call unexported function + pkgInfo.getAllDependencies(&resolved, &unresolved, includeMakeDepends, includeOptionalDepends, rootDir) + + return resolved +} + +func (pkgInfo *PackageInfo) getAllDependencies(resolved *[]string, unresolved *[]string, includeMakeDepends, includeOptionalDepends bool, rootDir string) { + // Add current package name to unresolved slice + *unresolved = append(*unresolved, pkgInfo.Name) + + // Loop through all dependencies + for _, depend := range pkgInfo.GetDependencies(includeMakeDepends, includeOptionalDepends) { + if !slices.Contains(*resolved, depend) { + // Add current dependency to resolved slice when circular dependency is detected + if slices.Contains(*unresolved, depend) { + if !slices.Contains(*resolved, depend) { + *resolved = append(*resolved, depend) + } + continue + } + + var dependInfo *PackageInfo + + if isVirtual, p := IsVirtualPackage(depend, rootDir); isVirtual { + dependInfo = GetPackageInfo(p, rootDir) + } else { + dependInfo = GetPackageInfo(depend, rootDir) + } + + if dependInfo != nil { + dependInfo.getAllDependencies(resolved, unresolved, includeMakeDepends, includeOptionalDepends, rootDir) + } + } + } + if !slices.Contains(*resolved, pkgInfo.Name) { + *resolved = append(*resolved, pkgInfo.Name) + } + *unresolved = stringSliceRemove(*unresolved, pkgInfo.Name) +} + +func ResolvePackageDependenciesFromDatabases(pkgInfo *PackageInfo, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) (resolved []string, unresolved []string) { + // Initialize slices + resolved = make([]string, 0) + unresolved = make([]string, 0) + + // Call unexported function + resolvePackageDependenciesFromDatabase(&resolved, &unresolved, pkgInfo, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) + + return resolved, unresolved +} + +func resolvePackageDependenciesFromDatabase(resolved, unresolved *[]string, pkgInfo *PackageInfo, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) { + // Add current package name to unresolved slice + *unresolved = append(*unresolved, pkgInfo.Name) + + // Loop through all dependencies + for _, depend := range pkgInfo.GetDependencies(checkMake, checkOptional) { + if !slices.Contains(*resolved, depend) { + // Add current dependency to resolved slice when circular dependency is detected + 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 && IsPackageProvided(depend, rootDir) { + continue + } + var err error + var entry *RepositoryEntry + entry, _, err = GetRepositoryEntry(depend) + if err != nil { + if entry = ResolveVirtualPackage(depend); entry == nil { + if !slices.Contains(*unresolved, depend) { + *unresolved = append(*unresolved, depend) + } + continue + } + } + resolvePackageDependenciesFromDatabase(resolved, unresolved, entry.Info, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) + } + } + if !slices.Contains(*resolved, pkgInfo.Name) { + *resolved = append(*resolved, pkgInfo.Name) + } + *unresolved = stringSliceRemove(*unresolved, pkgInfo.Name) +} + +func GetPackageDependants(pkgName string, rootDir string) ([]string, error) { + ret := make([]string, 0) + + // Get BPM package + pkg := GetPackage(pkgName, rootDir) + if pkg == nil { + return nil, errors.New("package not found: " + pkgName) + } + + // Get installed package names + pkgs, err := GetInstalledPackages(rootDir) + if err != nil { + return nil, errors.New("could not get installed packages") + } + + // Loop through all installed packages + for _, installedPkgName := range pkgs { + // Get installed BPM package + installedPkg := GetPackage(installedPkgName, rootDir) + if installedPkg == nil { + return nil, errors.New("package not found: " + installedPkgName) + } + + // Skip iteration if comparing the same packages + if installedPkg.PkgInfo.Name == pkgName { + continue + } + + // Get installed package dependencies + dependencies := installedPkg.PkgInfo.GetDependencies(false, true) + + // Add installed package to list if its dependencies include pkgName + if slices.Contains(dependencies, pkgName) { + ret = append(ret, installedPkgName) + continue + } + + // Loop through each virtual package + for _, vpkg := range pkg.PkgInfo.Provides { + // Add installed package to list if its dependencies contain a provided virtual package + if slices.Contains(dependencies, vpkg) { + ret = append(ret, installedPkgName) + break + } + } + } + + return ret, nil +} diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index b63ec52..c41cac5 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -161,7 +161,7 @@ func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencie // Do package cleanup if cleanupDependencies { - err := operation.Cleanup(verbose) + err := operation.Cleanup() if err != nil { return nil, fmt.Errorf("could not perform cleanup for operation: %s", err) } @@ -180,7 +180,7 @@ func CleanupPackages(rootDir string, verbose bool) (operation *BPMOperation, err } // Do package cleanup - err = operation.Cleanup(verbose) + err = operation.Cleanup() if err != nil { return nil, fmt.Errorf("could not perform cleanup for operation: %s", err) } diff --git a/src/bpmlib/hooks.go b/src/bpmlib/hooks.go index a9bbff4..cd966cd 100644 --- a/src/bpmlib/hooks.go +++ b/src/bpmlib/hooks.go @@ -99,7 +99,7 @@ func (hook *BPMHook) Execute(packageChanges map[string]string, verbose bool, roo // Get modified files slice modifiedFiles := make([]*PackageFileEntry, 0) for pkg := range packageChanges { - modifiedFiles = append(modifiedFiles, GetPackageFiles(pkg, rootDir)...) + modifiedFiles = append(modifiedFiles, GetPackage(pkg, rootDir).PkgFiles...) } // Check if any targets are met diff --git a/src/bpmlib/installed_packages.go b/src/bpmlib/installed_packages.go new file mode 100644 index 0000000..dc295f1 --- /dev/null +++ b/src/bpmlib/installed_packages.go @@ -0,0 +1,243 @@ +package bpmlib + +import ( + "errors" + "fmt" + "os" + "path" + "slices" + "strconv" + "strings" +) + +var localPackageInformation map[string]map[string]*BPMPackage = make(map[string]map[string]*BPMPackage) + +func initializeLocalPackageInformation(rootDir string) (err error) { + // Return if information is already initialized + if _, ok := localPackageInformation[rootDir]; ok { + return nil + } + + tempPackageInformation := make(map[string]*BPMPackage) + + // Get path to installed package information directory + installedDir := path.Join(rootDir, "var/lib/bpm/installed/") + + // Get directory content + items, err := os.ReadDir(installedDir) + if os.IsNotExist(err) { + localPackageInformation[rootDir] = make(map[string]*BPMPackage) + return nil + } + if err != nil { + return err + } + + // Loop through each subdirectory + for _, item := range items { + // Skip if not a directory + if !item.IsDir() { + continue + } + + // Read package info + infoData, err := os.ReadFile(path.Join(installedDir, item.Name(), "info")) + if err != nil { + return err + } + info, err := ReadPackageInfo(string(infoData)) + if err != nil { + return err + } + + // Read package files + files := getPackageFiles(info.Name, rootDir) + + // Add package to slice + tempPackageInformation[info.Name] = &BPMPackage{ + PkgInfo: info, + PkgFiles: files, + } + } + + localPackageInformation[rootDir] = tempPackageInformation + return nil +} + +func GetInstalledPackages(rootDir string) (ret []string, err error) { + // Initialize local package information + err = initializeLocalPackageInformation(rootDir) + if err != nil { + return nil, err + } + + // Loop through each package and add it to slice + for _, bpmpkg := range localPackageInformation[rootDir] { + ret = append(ret, bpmpkg.PkgInfo.Name) + } + + return ret, nil +} + +func IsPackageInstalled(pkg, rootDir string) bool { + // Initialize local package information + err := initializeLocalPackageInformation(rootDir) + if err != nil { + return false + } + + if _, ok := localPackageInformation[rootDir][pkg]; !ok { + return false + } + return true +} + +func GetPackageInfo(pkg string, rootDir string) *PackageInfo { + // Get BPM package + bpmpkg := GetPackage(pkg, rootDir) + + // Return nil if not found + if bpmpkg == nil { + return nil + } + + return bpmpkg.PkgInfo +} + +func IsVirtualPackage(pkg, rootDir string) (bool, string) { + pkgs, err := GetInstalledPackages(rootDir) + if err != nil { + return false, "" + } + for _, p := range pkgs { + if p == pkg { + return false, "" + } + i := GetPackageInfo(p, rootDir) + if i == nil { + continue + } + if slices.Contains(i.Provides, pkg) { + return true, p + } + } + return false, "" +} + +func IsPackageProvided(pkg, rootDir string) bool { + pkgs, err := GetInstalledPackages(rootDir) + if err != nil { + return false + } + for _, p := range pkgs { + if p == pkg { + return true + } + i := GetPackageInfo(p, rootDir) + if i == nil { + continue + } + if slices.Contains(i.Provides, pkg) { + return true + } + } + return false +} + +func GetPackage(pkg, rootDir string) *BPMPackage { + err := initializeLocalPackageInformation(rootDir) + if err != nil { + return nil + } + + bpmpkg := localPackageInformation[rootDir][pkg] + + return bpmpkg +} + +func GetAllPackageFiles(rootDir string, excludePackages ...string) (map[string][]*BPMPackage, error) { + ret := make(map[string][]*BPMPackage) + + pkgNames, err := GetInstalledPackages(rootDir) + if err != nil { + return nil, err + } + + for _, pkgName := range pkgNames { + if slices.Contains(excludePackages, pkgName) { + continue + } + bpmpkg := GetPackage(pkgName, rootDir) + if bpmpkg == nil { + return nil, errors.New(fmt.Sprintf("could not get BPM package (%s)", pkgName)) + } + for _, entry := range bpmpkg.PkgFiles { + if _, ok := ret[entry.Path]; ok { + ret[entry.Path] = append(ret[entry.Path], bpmpkg) + } else { + ret[entry.Path] = []*BPMPackage{bpmpkg} + } + } + } + + return ret, nil +} + +func getPackageFiles(pkg, rootDir string) []*PackageFileEntry { + var pkgFiles []*PackageFileEntry + installedDir := path.Join(rootDir, "var/lib/bpm/installed/") + pkgDir := path.Join(installedDir, pkg) + files := path.Join(pkgDir, "files") + if _, err := os.Stat(installedDir); os.IsNotExist(err) { + return nil + } + if _, err := os.Stat(pkgDir); os.IsNotExist(err) { + return nil + } + bs, err := os.ReadFile(files) + if err != nil { + return nil + } + + for _, line := range strings.Split(string(bs), "\n") { + if strings.TrimSpace(line) == "" { + continue + } + stringEntry := strings.Split(strings.TrimSpace(line), " ") + if len(stringEntry) < 5 { + pkgFiles = append(pkgFiles, &PackageFileEntry{ + Path: strings.TrimSuffix(line, "/"), + OctalPerms: 0, + UserID: 0, + GroupID: 0, + SizeInBytes: 0, + }) + continue + } + uid, err := strconv.ParseInt(stringEntry[len(stringEntry)-4], 0, 32) + if err != nil { + return nil + } + octalPerms, err := strconv.ParseInt(stringEntry[len(stringEntry)-3], 0, 32) + if err != nil { + return nil + } + gid, err := strconv.ParseInt(stringEntry[len(stringEntry)-2], 0, 32) + if err != nil { + return nil + } + size, err := strconv.ParseUint(stringEntry[len(stringEntry)-1], 0, 64) + if err != nil { + return nil + } + pkgFiles = append(pkgFiles, &PackageFileEntry{ + Path: strings.TrimSuffix(strings.Join(stringEntry[:len(stringEntry)-4], " "), "/"), + OctalPerms: uint32(octalPerms), + UserID: int(uid), + GroupID: int(gid), + SizeInBytes: size, + }) + } + + return pkgFiles +} diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index 0a3648b..0a50e41 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -139,7 +139,7 @@ func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, instal continue } - resolved, unresolved := pkgInfo.ResolveDependencies(&[]string{}, &[]string{}, pkgInfo.Type == "source", installOptionalDependencies, !reinstallDependencies, verbose, operation.RootDir) + resolved, unresolved := ResolvePackageDependenciesFromDatabases(pkgInfo, pkgInfo.Type == "source", installOptionalDependencies, !reinstallDependencies, verbose, operation.RootDir) operation.UnresolvedDepends = append(operation.UnresolvedDepends, unresolved...) @@ -174,7 +174,7 @@ func (operation *BPMOperation) RemoveNeededPackages() error { } for pkg, action := range removeActions { - dependants, err := action.BpmPackage.PkgInfo.GetDependants(operation.RootDir) + dependants, err := GetPackageDependants(action.BpmPackage.PkgInfo.Name, operation.RootDir) if err != nil { return errors.New("could not get dependant packages for package (" + pkg + ")") } @@ -192,7 +192,7 @@ func (operation *BPMOperation) RemoveNeededPackages() error { return nil } -func (operation *BPMOperation) Cleanup(verbose bool) error { +func (operation *BPMOperation) Cleanup() error { // Get all installed packages installedPackageNames, err := GetInstalledPackages(operation.RootDir) if err != nil { @@ -228,9 +228,9 @@ func (operation *BPMOperation) Cleanup(verbose bool) error { } keepPackages = append(keepPackages, pkg.Name) - resolved, _ := pkg.ResolveDependencies(&[]string{}, &[]string{}, false, true, false, verbose, operation.RootDir) + resolved := pkg.GetAllDependencies(false, true, operation.RootDir) for _, value := range resolved { - if !slices.Contains(keepPackages, value) && slices.Contains(installedPackageNames, value) { + if !slices.Contains(keepPackages, value) { keepPackages = append(keepPackages, value) } } diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 503830b..6ea2b56 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -509,7 +509,7 @@ func CreateReadableInfo(showArchitecture, showType, showPackageRelations bool, p appendArray("Make Dependencies", pkgInfo.MakeDepends) } appendArray("Optional dependencies", pkgInfo.OptionalDepends) - dependants, err := pkgInfo.GetDependants(rootDir) + dependants, err := GetPackageDependants(pkgInfo.Name, rootDir) if err == nil { appendArray("Dependant packages", dependants) } @@ -681,7 +681,7 @@ func installPackage(filename, rootDir string, verbose, force bool) error { // Check if package is installed and remove current files if packageInstalled { // Fetching and reversing package file entry list - fileEntries := GetPackageFiles(bpmpkg.PkgInfo.Name, rootDir) + fileEntries := GetPackage(bpmpkg.PkgInfo.Name, rootDir).PkgFiles sort.Slice(fileEntries, func(i, j int) bool { return fileEntries[i].Path < fileEntries[j].Path }) @@ -873,312 +873,6 @@ func installPackage(filename, rootDir string, verbose, force bool) error { return nil } -func (pkgInfo *PackageInfo) GetAllDependencies(checkMake, checkOptional bool) []string { - allDepends := make([]string, 0) - allDepends = append(allDepends, pkgInfo.Depends...) - if checkMake { - allDepends = append(allDepends, pkgInfo.MakeDepends...) - } - if checkOptional { - allDepends = append(allDepends, pkgInfo.OptionalDepends...) - } - return allDepends -} - -func (pkgInfo *PackageInfo) CheckDependencies(checkMake, checkOptional bool, rootDir string) []string { - var ret []string - for _, dependency := range pkgInfo.Depends { - if !IsPackageProvided(dependency, rootDir) { - ret = append(ret, dependency) - } - } - if checkMake { - for _, dependency := range pkgInfo.MakeDepends { - if !IsPackageProvided(dependency, rootDir) { - ret = append(ret, dependency) - } - } - } - if checkOptional { - for _, dependency := range pkgInfo.OptionalDepends { - if !IsPackageProvided(dependency, rootDir) { - ret = append(ret, dependency) - } - } - } - - return ret -} - -func (pkgInfo *PackageInfo) GetDependants(rootDir string) ([]string, error) { - ret := make([]string, 0) - - pkgs, err := GetInstalledPackages(rootDir) - if err != nil { - return nil, errors.New("could not get installed packages") - } - for _, pkg := range pkgs { - bpmpkg := GetPackage(pkg, rootDir) - if bpmpkg == nil { - return nil, errors.New("package not found: " + pkg) - } - if bpmpkg.PkgInfo.Name == pkgInfo.Name { - continue - } - - dependencies := bpmpkg.PkgInfo.GetAllDependencies(false, true) - - if slices.Contains(dependencies, pkgInfo.Name) { - ret = append(ret, pkg) - continue - } - for _, vpkg := range pkgInfo.Provides { - if slices.Contains(dependencies, vpkg) { - ret = append(ret, pkg) - break - } - } - } - - return ret, nil -} - -func (pkgInfo *PackageInfo) CheckConflicts(rootDir string) []string { - var ret []string - for _, conflict := range pkgInfo.Conflicts { - if IsPackageInstalled(conflict, rootDir) { - ret = append(ret, conflict) - } - } - return ret -} - -func (pkgInfo *PackageInfo) ResolveDependencies(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) { - 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 && IsPackageProvided(depend, rootDir) { - continue - } - var err error - var entry *RepositoryEntry - entry, _, err = GetRepositoryEntry(depend) - if err != nil { - if entry = ResolveVirtualPackage(depend); entry == nil { - if !slices.Contains(*unresolved, depend) { - *unresolved = append(*unresolved, depend) - } - continue - } - } - entry.Info.ResolveDependencies(resolved, unresolved, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) - } - } - if !slices.Contains(*resolved, pkgInfo.Name) { - *resolved = append(*resolved, pkgInfo.Name) - } - *unresolved = stringSliceRemove(*unresolved, pkgInfo.Name) - return *resolved, *unresolved -} - -func IsPackageInstalled(pkg, rootDir string) bool { - installedDir := path.Join(rootDir, "var/lib/bpm/installed/") - pkgDir := path.Join(installedDir, pkg) - if _, err := os.Stat(pkgDir); err != nil { - return false - } - return true -} - -func IsVirtualPackage(pkg, rootDir string) (bool, string) { - pkgs, err := GetInstalledPackages(rootDir) - if err != nil { - return false, "" - } - for _, p := range pkgs { - if p == pkg { - return false, "" - } - i := GetPackageInfo(p, rootDir) - if i == nil { - continue - } - if slices.Contains(i.Provides, pkg) { - return true, p - } - } - return false, "" -} - -func IsPackageProvided(pkg, rootDir string) bool { - pkgs, err := GetInstalledPackages(rootDir) - if err != nil { - return false - } - for _, p := range pkgs { - if p == pkg { - return true - } - i := GetPackageInfo(p, rootDir) - if i == nil { - continue - } - if slices.Contains(i.Provides, pkg) { - return true - } - } - return false -} - -func GetInstalledPackages(rootDir string) ([]string, error) { - installedDir := path.Join(rootDir, "var/lib/bpm/installed/") - items, err := os.ReadDir(installedDir) - if os.IsNotExist(err) { - return nil, nil - } - if err != nil { - return nil, err - } - var ret []string - for _, item := range items { - ret = append(ret, item.Name()) - } - return ret, nil -} - -func GetPackageFiles(pkg, rootDir string) []*PackageFileEntry { - var pkgFiles []*PackageFileEntry - installedDir := path.Join(rootDir, "var/lib/bpm/installed/") - pkgDir := path.Join(installedDir, pkg) - files := path.Join(pkgDir, "files") - if _, err := os.Stat(installedDir); os.IsNotExist(err) { - return nil - } - if _, err := os.Stat(pkgDir); os.IsNotExist(err) { - return nil - } - bs, err := os.ReadFile(files) - if err != nil { - return nil - } - - for _, line := range strings.Split(string(bs), "\n") { - if strings.TrimSpace(line) == "" { - continue - } - stringEntry := strings.Split(strings.TrimSpace(line), " ") - if len(stringEntry) < 5 { - pkgFiles = append(pkgFiles, &PackageFileEntry{ - Path: strings.TrimSuffix(line, "/"), - OctalPerms: 0, - UserID: 0, - GroupID: 0, - SizeInBytes: 0, - }) - continue - } - uid, err := strconv.ParseInt(stringEntry[len(stringEntry)-4], 0, 32) - if err != nil { - return nil - } - octalPerms, err := strconv.ParseInt(stringEntry[len(stringEntry)-3], 0, 32) - if err != nil { - return nil - } - gid, err := strconv.ParseInt(stringEntry[len(stringEntry)-2], 0, 32) - if err != nil { - return nil - } - size, err := strconv.ParseUint(stringEntry[len(stringEntry)-1], 0, 64) - if err != nil { - return nil - } - pkgFiles = append(pkgFiles, &PackageFileEntry{ - Path: strings.TrimSuffix(strings.Join(stringEntry[:len(stringEntry)-4], " "), "/"), - OctalPerms: uint32(octalPerms), - UserID: int(uid), - GroupID: int(gid), - SizeInBytes: size, - }) - } - - return pkgFiles -} - -func GetPackageInfo(pkg, rootDir string) *PackageInfo { - installedDir := path.Join(rootDir, "var/lib/bpm/installed/") - pkgDir := path.Join(installedDir, pkg) - files := path.Join(pkgDir, "info") - if _, err := os.Stat(installedDir); os.IsNotExist(err) { - return nil - } - if _, err := os.Stat(pkgDir); os.IsNotExist(err) { - return nil - } - file, err := os.Open(files) - if err != nil { - return nil - } - bs, err := io.ReadAll(file) - if err != nil { - return nil - } - info, err := ReadPackageInfo(string(bs)) - if err != nil { - return nil - } - return info -} - -func GetPackage(pkg, rootDir string) *BPMPackage { - if !IsPackageInstalled(pkg, rootDir) { - return nil - } - - return &BPMPackage{ - PkgInfo: GetPackageInfo(pkg, rootDir), - PkgFiles: GetPackageFiles(pkg, rootDir), - } -} - -func GetAllPackageFiles(rootDir string, excludePackages ...string) (map[string][]*BPMPackage, error) { - ret := make(map[string][]*BPMPackage) - - pkgNames, err := GetInstalledPackages(rootDir) - if err != nil { - return nil, err - } - - for _, pkgName := range pkgNames { - if slices.Contains(excludePackages, pkgName) { - continue - } - bpmpkg := GetPackage(pkgName, rootDir) - if bpmpkg == nil { - return nil, errors.New(fmt.Sprintf("could not get BPM package (%s)", pkgName)) - } - for _, entry := range bpmpkg.PkgFiles { - if _, ok := ret[entry.Path]; ok { - ret[entry.Path] = append(ret[entry.Path], bpmpkg) - } else { - ret[entry.Path] = []*BPMPackage{bpmpkg} - } - } - } - - return ret, nil -} - func removePackage(pkg string, verbose bool, rootDir string) error { installedDir := path.Join(rootDir, "var/lib/bpm/installed/") pkgDir := path.Join(installedDir, pkg) @@ -1206,7 +900,7 @@ func removePackage(pkg string, verbose bool, rootDir string) error { } // Fetching and reversing package file entry list - fileEntries := GetPackageFiles(pkg, rootDir) + fileEntries := GetPackage(pkg, rootDir).PkgFiles sort.Slice(fileEntries, func(i, j int) bool { return fileEntries[i].Path < fileEntries[j].Path }) -- 2.47.2 From f20d7b66d1791511e175272e06fcb6f6374dbf02 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 13 May 2025 20:33:20 +0300 Subject: [PATCH 28/33] Remove unused verbose parameters --- src/bpm/main.go | 4 ++-- src/bpmlib/general.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index 92b4dd8..eaba541 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -415,7 +415,7 @@ func resolveCommand() { } // Create remove operation - operation, err := bpmlib.RemovePackages(rootDir, removeUnused, doCleanup, verbose, subcommandArgs...) + operation, err := bpmlib.RemovePackages(rootDir, removeUnused, doCleanup, subcommandArgs...) if errors.As(err, &bpmlib.PackageNotFoundErr{}) || errors.As(err, &bpmlib.DependencyNotFoundErr{}) || errors.As(err, &bpmlib.PackageConflictErr{}) { log.Fatalf("Error: %s", err) } else if err != nil { @@ -473,7 +473,7 @@ func resolveCommand() { } // Create cleanup operation - operation, err := bpmlib.CleanupPackages(rootDir, verbose) + operation, err := bpmlib.CleanupPackages(rootDir) if errors.As(err, &bpmlib.PackageNotFoundErr{}) || errors.As(err, &bpmlib.DependencyNotFoundErr{}) || errors.As(err, &bpmlib.PackageConflictErr{}) { log.Fatalf("Error: %s", err) } else if err != nil { diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index c41cac5..fd15a55 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -133,7 +133,7 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein } // RemovePackages removes the specified packages from the given root directory -func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencies, verbose bool, packages ...string) (operation *BPMOperation, err error) { +func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencies bool, packages ...string) (operation *BPMOperation, err error) { operation = &BPMOperation{ Actions: make([]OperationAction, 0), UnresolvedDepends: make([]string, 0), @@ -170,7 +170,7 @@ func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencie } // CleanupPackages finds packages installed as dependencies which are no longer required by the rest of the system in the given root directory -func CleanupPackages(rootDir string, verbose bool) (operation *BPMOperation, err error) { +func CleanupPackages(rootDir string) (operation *BPMOperation, err error) { operation = &BPMOperation{ Actions: make([]OperationAction, 0), UnresolvedDepends: make([]string, 0), -- 2.47.2 From d26d878308f69bdfd44ae024510a8d53158062d3 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 13 May 2025 20:44:16 +0300 Subject: [PATCH 29/33] Fix error when installing, updating or remove packages --- src/bpmlib/hooks.go | 5 ++++- src/bpmlib/packages.go | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/bpmlib/hooks.go b/src/bpmlib/hooks.go index cd966cd..d6e6d23 100644 --- a/src/bpmlib/hooks.go +++ b/src/bpmlib/hooks.go @@ -99,7 +99,10 @@ func (hook *BPMHook) Execute(packageChanges map[string]string, verbose bool, roo // Get modified files slice modifiedFiles := make([]*PackageFileEntry, 0) for pkg := range packageChanges { - modifiedFiles = append(modifiedFiles, GetPackage(pkg, rootDir).PkgFiles...) + if GetPackage(pkg, rootDir) != nil { + modifiedFiles = append(modifiedFiles, GetPackage(pkg, rootDir).PkgFiles...) + } + } // Check if any targets are met diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 6ea2b56..eda206b 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -870,6 +870,16 @@ func installPackage(filename, rootDir string, verbose, force bool) error { return err } } + + // Ensure local package information has been initialized for rootDir + err = initializeLocalPackageInformation(rootDir) + if err != nil { + return err + } + + // Add or update package information for rootDir + localPackageInformation[rootDir][bpmpkg.PkgInfo.Name] = bpmpkg + return nil } @@ -999,5 +1009,14 @@ func removePackage(pkg string, verbose bool, rootDir string) error { return err } + // Ensure local package information has been initialized for rootDir + err = initializeLocalPackageInformation(rootDir) + if err != nil { + return err + } + + // Add or update package information for rootDir + delete(localPackageInformation[rootDir], pkgInfo.Name) + return nil } -- 2.47.2 From bf2b4e95ac8fd26c9fb68c0ba8eaed5d97e19f0d Mon Sep 17 00:00:00 2001 From: EnumDev Date: Wed, 14 May 2025 15:01:28 +0300 Subject: [PATCH 30/33] Fix installation reason showing in 'info' subcommand when viewing not-installed package, database entry or BPM file --- src/bpm/main.go | 6 ++++-- src/bpmlib/packages.go | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index eaba541..32ef64b 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -124,6 +124,7 @@ func resolveCommand() { for n, pkg := range packages { var info *bpmlib.PackageInfo isFile := false + showInstallationReason := false if showRepoInfo { var err error var entry *bpmlib.RepositoryEntry @@ -147,6 +148,7 @@ func resolveCommand() { } else { info = bpmlib.GetPackageInfo(pkg, rootDir) } + showInstallationReason = true } if info == nil { log.Fatalf("Error: package (%s) is not installed\n", pkg) @@ -161,7 +163,7 @@ func resolveCommand() { } fmt.Println("File: " + abs) } - fmt.Println(bpmlib.CreateReadableInfo(true, true, true, info, rootDir)) + fmt.Println(bpmlib.CreateReadableInfo(true, true, true, showInstallationReason, info, rootDir)) } case list: // Read local databases @@ -195,7 +197,7 @@ func resolveCommand() { if n != 0 { fmt.Println() } - fmt.Println(bpmlib.CreateReadableInfo(true, true, true, info, rootDir)) + fmt.Println(bpmlib.CreateReadableInfo(true, true, true, true, info, rootDir)) } } case search: diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index eda206b..5c4471d 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -484,7 +484,7 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { return pkgInfo, nil } -func CreateReadableInfo(showArchitecture, showType, showPackageRelations bool, pkgInfo *PackageInfo, rootDir string) string { +func CreateReadableInfo(showArchitecture, showType, showPackageRelations, showInstallationReason bool, pkgInfo *PackageInfo, rootDir string) string { ret := make([]string, 0) appendArray := func(label string, array []string) { if len(array) == 0 { @@ -524,7 +524,9 @@ func CreateReadableInfo(showArchitecture, showType, showPackageRelations bool, p } appendArray("Split Packages", splitPkgs) } - ret = append(ret, "Installation Reason: "+string(GetInstallationReason(pkgInfo.Name, rootDir))) + if IsPackageInstalled(pkgInfo.Name, rootDir) && showInstallationReason { + ret = append(ret, "Installation Reason: "+string(GetInstallationReason(pkgInfo.Name, rootDir))) + } return strings.Join(ret, "\n") } -- 2.47.2 From 815d0bb29a8fe027290c13b3bf319e9f6666a28d Mon Sep 17 00:00:00 2001 From: EnumDev Date: Wed, 14 May 2025 16:33:30 +0300 Subject: [PATCH 31/33] Rename BPM Repositories to BPM Databases --- README.md | 4 +- config/bpm.conf | 6 +- src/bpm/main.go | 46 +++---- src/bpmlib/config.go | 14 +- src/bpmlib/{repositories.go => databases.go} | 128 +++++++++---------- src/bpmlib/dependencies.go | 4 +- src/bpmlib/errors.go | 4 +- src/bpmlib/general.go | 30 ++--- src/bpmlib/operations.go | 44 +++---- 9 files changed, 140 insertions(+), 140 deletions(-) rename src/bpmlib/{repositories.go => databases.go} (55%) diff --git a/README.md b/README.md index d49f03b..527b23d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ You are able to install bpm packages by typing the following: ```sh bpm install /path/to/package.bpm ``` -You can also use the package name directly if using repositories +You can also use the package name directly if using databases ```sh bpm install package_name ``` @@ -50,7 +50,7 @@ To remove all unused dependencies and clean cached files try using the cleanup c bpm cleanup ``` -If using repositories, all packages can be updated using this simple command +If using databases, all packages can be updated using this simple command ```sh bpm update ``` diff --git a/config/bpm.conf b/config/bpm.conf index 6d31c3e..f32bc41 100644 --- a/config/bpm.conf +++ b/config/bpm.conf @@ -1,7 +1,7 @@ ignore_packages: [] privilege_escalator_cmd: "sudo" compilation_env: [] -repositories: - - name: example-repository - source: https://my-repo.xyz/ +databases: + - name: example-database + source: https://my-database.xyz/ disabled: true \ No newline at end of file diff --git a/src/bpm/main.go b/src/bpm/main.go index 32ef64b..329d8af 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -39,7 +39,7 @@ var installationReason = "" var nosync = true var removeUnused = false var doCleanup = false -var showRepoInfo = false +var showDatabaseInfo = false var installSrcPkgDepends = false var skipChecks = false var outputDirectory = "" @@ -116,7 +116,7 @@ func resolveCommand() { } // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -125,13 +125,13 @@ func resolveCommand() { var info *bpmlib.PackageInfo isFile := false showInstallationReason := false - if showRepoInfo { + if showDatabaseInfo { var err error - var entry *bpmlib.RepositoryEntry - entry, _, err = bpmlib.GetRepositoryEntry(pkg) + var entry *bpmlib.BPMDatabaseEntry + entry, _, err = bpmlib.GetDatabaseEntry(pkg) if err != nil { if entry = bpmlib.ResolveVirtualPackage(pkg); entry == nil { - log.Fatalf("Error: could not find package (%s) in any repository\n", pkg) + log.Fatalf("Error: could not find package (%s) in any database\n", pkg) } } info = entry.Info @@ -167,7 +167,7 @@ func resolveCommand() { } case list: // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -207,7 +207,7 @@ func resolveCommand() { } // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -215,8 +215,8 @@ func resolveCommand() { for i, term := range searchTerms { nameResults := make([]*bpmlib.PackageInfo, 0) descResults := make([]*bpmlib.PackageInfo, 0) - for _, repo := range bpmlib.BPMConfig.Repositories { - for _, entry := range repo.Entries { + for _, db := range bpmlib.BPMConfig.Databases { + for _, entry := range db.Entries { if strings.Contains(entry.Info.Name, term) { nameResults = append(nameResults, entry.Info) } else if strings.Contains(entry.Info.Description, term) { @@ -271,7 +271,7 @@ func resolveCommand() { } // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -329,7 +329,7 @@ func resolveCommand() { // Read local databases if no sync if nosync { - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -411,7 +411,7 @@ func resolveCommand() { } // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -469,7 +469,7 @@ func resolveCommand() { if cleanupDependencies { // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -571,7 +571,7 @@ func resolveCommand() { } // Read local databases - err := bpmlib.ReadLocalDatabases() + err := bpmlib.ReadLocalDatabaseFiles() if err != nil { log.Fatalf("Error: could not read local databases: %s", err) } @@ -643,7 +643,7 @@ func resolveCommand() { } else { // Ensure the required dependencies are installed if len(unmetDepends) != 0 { - log.Fatalf("Error: could not resolve dependencies: the following dependencies were not found in any repositories: " + strings.Join(unmetDepends, ", ")) + log.Fatalf("Error: could not resolve dependencies: the following dependencies were not found in any databases: " + strings.Join(unmetDepends, ", ")) } } @@ -738,14 +738,14 @@ func printHelp() { fmt.Println("-> flags will be read if passed right after the subcommand otherwise they will be read as subcommand arguments") fmt.Println("\033[1m---- Command List ----\033[0m") fmt.Println("-> bpm version | shows information on the installed version of bpm") - fmt.Println("-> bpm info [-R, --repos] | shows information on an installed package") + fmt.Println("-> bpm info [-R, --databases] | shows information on an installed package") fmt.Println(" -R= lets you define the root path which will be used") - fmt.Println(" --repos show information on package in repository") + fmt.Println(" --databases show information on package in configured databases") fmt.Println("-> bpm list [-R, -c, -n] | lists all installed packages") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -c lists the amount of installed packages") fmt.Println(" -n lists only the names of installed packages") - fmt.Println("-> bpm search | Searches for packages through declared repositories") + fmt.Println("-> bpm search | Searches for packages through configured databases") fmt.Println("-> bpm install [-R, -v, -y, -f, --reinstall, --reinstall-all, --no-optional, --installation-reason] | installs the following files") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -v Show additional information about what BPM is doing") @@ -755,7 +755,7 @@ func printHelp() { fmt.Println(" --reinstall-all Same as --reinstall but also reinstalls dependencies") fmt.Println(" --no-optional Prevents installation of optional dependencies") fmt.Println(" --installation-reason= sets the installation reason for all newly installed packages") - fmt.Println("-> bpm update [-R, -v, -y, -f, --reinstall, --no-sync] | updates all packages that are available in the repositories") + fmt.Println("-> bpm update [-R, -v, -y, -f, --reinstall, --no-sync] | updates all packages that are available in the configured databases") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -v Show additional information about what BPM is doing") fmt.Println(" -y skips the confirmation prompt") @@ -779,7 +779,7 @@ func printHelp() { fmt.Println(" --depends performs a dependency cleanup") fmt.Println(" --compilation-files performs a cleanup of compilation files") fmt.Println(" --compiled-pkgs performs a cleanup of compilation compiled binary packages") - fmt.Println(" --fetched-pkgs performs a cleanup of fetched packages from repositories") + fmt.Println(" --fetched-pkgs performs a cleanup of fetched packages from databases") fmt.Println("-> bpm file [-R] | shows what packages the following packages are managed by") fmt.Println(" -R= lets you define the root path which will be used") fmt.Println("-> bpm compile [-d, -s, -o] | Compile source BPM package") @@ -802,7 +802,7 @@ func resolveFlags() { // Info flags infoFlagSet := flag.NewFlagSet("Info flags", flag.ExitOnError) infoFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root") - infoFlagSet.BoolVar(&showRepoInfo, "repos", false, "Show information on package in repository") + infoFlagSet.BoolVar(&showDatabaseInfo, "databases", false, "Show information on package in configured databases") infoFlagSet.Usage = printHelp // Install flags installFlagSet := flag.NewFlagSet("Install flags", flag.ExitOnError) @@ -845,7 +845,7 @@ func resolveFlags() { cleanupFlagSet.BoolVar(&cleanupDependencies, "depends", false, "Perform a dependency cleanup") cleanupFlagSet.BoolVar(&cleanupCompilationFiles, "compilation-files", false, "Perform a cleanup of compilation files") cleanupFlagSet.BoolVar(&cleanupCompiledPackages, "compiled-pkgs", false, "Perform a cleanup of compilation compiled binary packages") - cleanupFlagSet.BoolVar(&cleanupFetchedPackages, "fetched-pkgs", false, "Perform a cleanup of fetched packages from repositories") + cleanupFlagSet.BoolVar(&cleanupFetchedPackages, "fetched-pkgs", false, "Perform a cleanup of fetched packages from databases") cleanupFlagSet.Usage = printHelp // File flags fileFlagSet := flag.NewFlagSet("Remove flags", flag.ExitOnError) diff --git a/src/bpmlib/config.go b/src/bpmlib/config.go index fbf5fda..0c24e57 100644 --- a/src/bpmlib/config.go +++ b/src/bpmlib/config.go @@ -6,10 +6,10 @@ import ( ) type BPMConfigStruct struct { - IgnorePackages []string `yaml:"ignore_packages"` - PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"` - CompilationEnvironment []string `yaml:"compilation_env"` - Repositories []*Repository `yaml:"repositories"` + IgnorePackages []string `yaml:"ignore_packages"` + PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"` + CompilationEnvironment []string `yaml:"compilation_env"` + Databases []*BPMDatabase `yaml:"databases"` } var BPMConfig BPMConfigStruct @@ -30,9 +30,9 @@ func ReadConfig() (err error) { return err } - for i := len(BPMConfig.Repositories) - 1; i >= 0; i-- { - if BPMConfig.Repositories[i].Disabled != nil && *BPMConfig.Repositories[i].Disabled { - BPMConfig.Repositories = append(BPMConfig.Repositories[:i], BPMConfig.Repositories[i+1:]...) + for i := len(BPMConfig.Databases) - 1; i >= 0; i-- { + if BPMConfig.Databases[i].Disabled != nil && *BPMConfig.Databases[i].Disabled { + BPMConfig.Databases = append(BPMConfig.Databases[:i], BPMConfig.Databases[i+1:]...) } } diff --git a/src/bpmlib/repositories.go b/src/bpmlib/databases.go similarity index 55% rename from src/bpmlib/repositories.go rename to src/bpmlib/databases.go index cafc6b1..6b14195 100644 --- a/src/bpmlib/repositories.go +++ b/src/bpmlib/databases.go @@ -12,41 +12,41 @@ import ( "strings" ) -type Repository struct { +type BPMDatabase struct { Name string `yaml:"name"` Source string `yaml:"source"` Disabled *bool `yaml:"disabled"` - Entries map[string]*RepositoryEntry + Entries map[string]*BPMDatabaseEntry VirtualPackages map[string][]string } -type RepositoryEntry struct { +type BPMDatabaseEntry struct { Info *PackageInfo `yaml:"info"` Download string `yaml:"download"` DownloadSize uint64 `yaml:"download_size"` InstalledSize uint64 `yaml:"installed_size"` - Repository *Repository + Database *BPMDatabase } -func (repo *Repository) ContainsPackage(pkg string) bool { - _, ok := repo.Entries[pkg] +func (db *BPMDatabase) ContainsPackage(pkg string) bool { + _, ok := db.Entries[pkg] return ok } -func (repo *Repository) ReadLocalDatabase() error { - repoFile := "/var/lib/bpm/repositories/" + repo.Name + ".bpmdb" - if _, err := os.Stat(repoFile); err != nil { +func (db *BPMDatabase) ReadLocalDatabase() error { + dbFile := "/var/lib/bpm/databases/" + db.Name + ".bpmdb" + if _, err := os.Stat(dbFile); err != nil { return nil } - bytes, err := os.ReadFile(repoFile) + bytes, err := os.ReadFile(dbFile) if err != nil { return err } data := string(bytes) for _, b := range strings.Split(data, "---") { - entry := RepositoryEntry{ + entry := BPMDatabaseEntry{ Info: &PackageInfo{ Name: "", Description: "", @@ -66,14 +66,14 @@ func (repo *Repository) ReadLocalDatabase() error { Download: "", DownloadSize: 0, InstalledSize: 0, - Repository: repo, + Database: db, } err := yaml.Unmarshal([]byte(b), &entry) if err != nil { return err } - // Create repository entries + // Create database entries if entry.Info.IsSplitPackage() { for _, splitPkg := range entry.Info.SplitPackages { // Turn split package into json data @@ -100,26 +100,26 @@ func (repo *Repository) ReadLocalDatabase() error { splitPkgClone.Url = entry.Info.Url // Create entry for split package - repo.Entries[splitPkg.Name] = &RepositoryEntry{ + db.Entries[splitPkg.Name] = &BPMDatabaseEntry{ Info: &splitPkgClone, Download: entry.Download, DownloadSize: entry.DownloadSize, InstalledSize: 0, - Repository: repo, + Database: db, } - // Add virtual packages to repository + // Add virtual packages to database for _, p := range splitPkg.Provides { - repo.VirtualPackages[p] = append(repo.VirtualPackages[p], splitPkg.Name) + db.VirtualPackages[p] = append(db.VirtualPackages[p], splitPkg.Name) } } } else { // Create entry for package - repo.Entries[entry.Info.Name] = &entry + db.Entries[entry.Info.Name] = &entry - // Add virtual packages to repository + // Add virtual packages to database for _, p := range entry.Info.Provides { - repo.VirtualPackages[p] = append(repo.VirtualPackages[p], entry.Info.Name) + db.VirtualPackages[p] = append(db.VirtualPackages[p], entry.Info.Name) } } @@ -128,11 +128,11 @@ func (repo *Repository) ReadLocalDatabase() error { return nil } -func (repo *Repository) SyncLocalDatabase() error { - repoFile := "/var/lib/bpm/repositories/" + repo.Name + ".bpmdb" +func (db *BPMDatabase) SyncLocalDatabaseFile() error { + dbFile := "/var/lib/bpm/databases/" + db.Name + ".bpmdb" // Get URL to database - u, err := url.JoinPath(repo.Source, "database.bpmdb") + u, err := url.JoinPath(db.Source, "database.bpmdb") if err != nil { return err } @@ -147,20 +147,20 @@ func (repo *Repository) SyncLocalDatabase() error { // Load data into byte buffer buffer, err := io.ReadAll(resp.Body) - // Unmarshal data to ensure it is a valid BPM repository - err = yaml.Unmarshal(buffer, &Repository{}) + // Unmarshal data to ensure it is a valid BPM database + err = yaml.Unmarshal(buffer, &BPMDatabase{}) if err != nil { - return fmt.Errorf("could not decode repository: %s", err) + return fmt.Errorf("could not decode database: %s", err) } - // Create parent directories to repository file - err = os.MkdirAll(path.Dir(repoFile), 0755) + // Create parent directories to database file + err = os.MkdirAll(path.Dir(dbFile), 0755) if err != nil { return err } - // Create file and save repository data - out, err := os.Create(repoFile) + // Create file and save database data + out, err := os.Create(dbFile) if err != nil { return err } @@ -171,14 +171,14 @@ func (repo *Repository) SyncLocalDatabase() error { return nil } -func ReadLocalDatabases() (err error) { - for _, repo := range BPMConfig.Repositories { +func ReadLocalDatabaseFiles() (err error) { + for _, db := range BPMConfig.Databases { // Initialize struct values - repo.Entries = make(map[string]*RepositoryEntry) - repo.VirtualPackages = make(map[string][]string) + db.Entries = make(map[string]*BPMDatabaseEntry) + db.VirtualPackages = make(map[string][]string) // Read database - err = repo.ReadLocalDatabase() + err = db.ReadLocalDatabase() if err != nil { return err } @@ -187,47 +187,47 @@ func ReadLocalDatabases() (err error) { return nil } -func GetRepository(name string) *Repository { - for _, repo := range BPMConfig.Repositories { - if repo.Name == name { - return repo +func GetDatabase(name string) *BPMDatabase { + for _, db := range BPMConfig.Databases { + if db.Name == name { + return db } } return nil } -func GetRepositoryEntry(str string) (*RepositoryEntry, *Repository, error) { +func GetDatabaseEntry(str string) (*BPMDatabaseEntry, *BPMDatabase, error) { split := strings.Split(str, "/") if len(split) == 1 { pkgName := strings.TrimSpace(split[0]) if pkgName == "" { - return nil, nil, errors.New("could not find repository entry for this package") + return nil, nil, errors.New("could not find database entry for this package") } - for _, repo := range BPMConfig.Repositories { - if repo.ContainsPackage(pkgName) { - return repo.Entries[pkgName], repo, nil + for _, db := range BPMConfig.Databases { + if db.ContainsPackage(pkgName) { + return db.Entries[pkgName], db, nil } } - return nil, nil, errors.New("could not find repository entry for this package") + return nil, nil, errors.New("could not find database entry for this package") } else if len(split) == 2 { - repoName := strings.TrimSpace(split[0]) + dbName := strings.TrimSpace(split[0]) pkgName := strings.TrimSpace(split[1]) - if repoName == "" || pkgName == "" { - return nil, nil, errors.New("could not find repository entry for this package") + if dbName == "" || pkgName == "" { + return nil, nil, errors.New("could not find database entry for this package") } - repo := GetRepository(repoName) - if repo == nil || !repo.ContainsPackage(pkgName) { - return nil, nil, errors.New("could not find repository entry for this package") + db := GetDatabase(dbName) + if db == nil || !db.ContainsPackage(pkgName) { + return nil, nil, errors.New("could not find database entry for this package") } - return repo.Entries[pkgName], repo, nil + return db.Entries[pkgName], db, nil } else { - return nil, nil, errors.New("could not find repository entry for this package") + return nil, nil, errors.New("could not find database entry for this package") } } -func FindReplacement(pkg string) *RepositoryEntry { - for _, repo := range BPMConfig.Repositories { - for _, entry := range repo.Entries { +func FindReplacement(pkg string) *BPMDatabaseEntry { + for _, db := range BPMConfig.Databases { + for _, entry := range db.Entries { for _, replaced := range entry.Info.Replaces { if replaced == pkg { return entry @@ -239,11 +239,11 @@ func FindReplacement(pkg string) *RepositoryEntry { return nil } -func ResolveVirtualPackage(vpkg string) *RepositoryEntry { - for _, repo := range BPMConfig.Repositories { - if v, ok := repo.VirtualPackages[vpkg]; ok { +func ResolveVirtualPackage(vpkg string) *BPMDatabaseEntry { + for _, db := range BPMConfig.Databases { + if v, ok := db.VirtualPackages[vpkg]; ok { for _, pkg := range v { - return repo.Entries[pkg] + return db.Entries[pkg] } } } @@ -251,12 +251,12 @@ func ResolveVirtualPackage(vpkg string) *RepositoryEntry { return nil } -func (repo *Repository) FetchPackage(pkg string) (string, error) { - if !repo.ContainsPackage(pkg) { +func (db *BPMDatabase) FetchPackage(pkg string) (string, error) { + if !db.ContainsPackage(pkg) { return "", errors.New("could not fetch package '" + pkg + "'") } - entry := repo.Entries[pkg] - URL, err := url.JoinPath(repo.Source, entry.Download) + entry := db.Entries[pkg] + URL, err := url.JoinPath(db.Source, entry.Download) if err != nil { return "", err } diff --git a/src/bpmlib/dependencies.go b/src/bpmlib/dependencies.go index d71a105..f349903 100644 --- a/src/bpmlib/dependencies.go +++ b/src/bpmlib/dependencies.go @@ -94,8 +94,8 @@ func resolvePackageDependenciesFromDatabase(resolved, unresolved *[]string, pkgI continue } var err error - var entry *RepositoryEntry - entry, _, err = GetRepositoryEntry(depend) + var entry *BPMDatabaseEntry + entry, _, err = GetDatabaseEntry(depend) if err != nil { if entry = ResolveVirtualPackage(depend); entry == nil { if !slices.Contains(*unresolved, depend) { diff --git a/src/bpmlib/errors.go b/src/bpmlib/errors.go index b9d193e..618251a 100644 --- a/src/bpmlib/errors.go +++ b/src/bpmlib/errors.go @@ -10,7 +10,7 @@ type PackageNotFoundErr struct { } func (e PackageNotFoundErr) Error() string { - return "The following packages were not found in any repositories: " + strings.Join(e.packages, ", ") + return "The following packages were not found in any databases: " + strings.Join(e.packages, ", ") } type DependencyNotFoundErr struct { @@ -18,7 +18,7 @@ type DependencyNotFoundErr struct { } func (e DependencyNotFoundErr) Error() string { - return "The following dependencies were not found in any repositories: " + strings.Join(e.dependencies, ", ") + return "The following dependencies were not found in any databases: " + strings.Join(e.dependencies, ", ") } type PackageConflictErr struct { diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index fd15a55..8e28e05 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -17,7 +17,7 @@ const ( ReinstallMethodAll ReinstallMethod = iota ) -// InstallPackages installs the specified packages into the given root directory by fetching them from repositories or directly from local bpm archives +// InstallPackages installs the specified packages into the given root directory by fetching them from databases or directly from local bpm archives func InstallPackages(rootDir string, installationReason InstallationReason, reinstallMethod ReinstallMethod, installOptionalDependencies, forceInstallation, verbose bool, packages ...string) (operation *BPMOperation, err error) { // Setup operation struct operation = &BPMOperation{ @@ -64,12 +64,12 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein BpmPackage: bpmpkg, }) } else { - var entry *RepositoryEntry + var entry *BPMDatabaseEntry - if e, _, err := GetRepositoryEntry(pkg); err == nil { + if e, _, err := GetDatabaseEntry(pkg); err == nil { entry = e } else if isVirtual, p := IsVirtualPackage(pkg, rootDir); isVirtual { - entry, _, err = GetRepositoryEntry(p) + entry, _, err = GetDatabaseEntry(p) if err != nil { pkgsNotFound = append(pkgsNotFound, pkg) continue @@ -85,8 +85,8 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein } operation.AppendAction(&FetchPackageAction{ - IsDependency: false, - RepositoryEntry: entry, + IsDependency: false, + DatabaseEntry: entry, }) } } @@ -272,7 +272,7 @@ func CleanupCache(rootDir string, cleanupCompilationFiles, cleanupCompiledPackag // UpdatePackages fetches the newest versions of all installed packages from func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependencies, forceInstallation, verbose bool) (operation *BPMOperation, err error) { - // Sync repositories + // Sync databases if syncDatabase { err := SyncDatabase(verbose) if err != nil { @@ -287,7 +287,7 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci if err != nil { return nil, fmt.Errorf("could not read BPM config: %s", err) } - err = ReadLocalDatabases() + err = ReadLocalDatabaseFiles() if err != nil { return nil, fmt.Errorf("could not read local databases: %s", err) } @@ -313,11 +313,11 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci if slices.Contains(BPMConfig.IgnorePackages, pkg) { continue } - var entry *RepositoryEntry + var entry *BPMDatabaseEntry // Check if installed package can be replaced and install that instead if e := FindReplacement(pkg); e != nil { entry = e - } else if entry, _, err = GetRepositoryEntry(pkg); err != nil { + } else if entry, _, err = GetDatabaseEntry(pkg); err != nil { continue } @@ -328,8 +328,8 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci comparison := ComparePackageVersions(*entry.Info, *installedInfo) if comparison > 0 { operation.AppendAction(&FetchPackageAction{ - IsDependency: false, - RepositoryEntry: entry, + IsDependency: false, + DatabaseEntry: entry, }) } } @@ -355,12 +355,12 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci // SyncDatabase syncs all databases declared in /etc/bpm.conf func SyncDatabase(verbose bool) (err error) { - for _, repo := range BPMConfig.Repositories { + for _, db := range BPMConfig.Databases { if verbose { - fmt.Printf("Fetching package database for repository (%s)...\n", repo.Name) + fmt.Printf("Fetching package database file for database (%s)...\n", db.Name) } - err := repo.SyncLocalDatabase() + err := db.SyncLocalDatabaseFile() if err != nil { return err } diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index 0a50e41..de03e30 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -26,7 +26,7 @@ func (operation *BPMOperation) ActionsContainPackage(pkg string) bool { return true } } else if action.GetActionType() == "fetch" { - if action.(*FetchPackageAction).RepositoryEntry.Info.Name == pkg { + if action.(*FetchPackageAction).DatabaseEntry.Info.Name == pkg { return true } } else if action.GetActionType() == "remove" { @@ -58,7 +58,7 @@ func (operation *BPMOperation) InsertActionAt(index int, action OperationAction) operation.Changes[pkgInfo.Name] = "upgrade" } } else if action.GetActionType() == "fetch" { - pkgInfo := action.(*FetchPackageAction).RepositoryEntry.Info + pkgInfo := action.(*FetchPackageAction).DatabaseEntry.Info if !IsPackageInstalled(pkgInfo.Name, operation.RootDir) { operation.Changes[pkgInfo.Name] = "install" } else { @@ -77,7 +77,7 @@ func (operation *BPMOperation) RemoveAction(pkg, actionType string) { if a.GetActionType() == "install" { return a.(*InstallPackageAction).BpmPackage.PkgInfo.Name == pkg } else if a.GetActionType() == "fetch" { - return a.(*FetchPackageAction).RepositoryEntry.Info.Name == pkg + return a.(*FetchPackageAction).DatabaseEntry.Info.Name == pkg } else if a.GetActionType() == "remove" { return a.(*RemovePackageAction).BpmPackage.PkgInfo.Name == pkg } @@ -89,7 +89,7 @@ func (operation *BPMOperation) GetTotalDownloadSize() uint64 { var ret uint64 = 0 for _, action := range operation.Actions { if action.GetActionType() == "fetch" { - ret += action.(*FetchPackageAction).RepositoryEntry.DownloadSize + ret += action.(*FetchPackageAction).DatabaseEntry.DownloadSize } } return ret @@ -101,7 +101,7 @@ func (operation *BPMOperation) GetTotalInstalledSize() uint64 { if action.GetActionType() == "install" { ret += action.(*InstallPackageAction).BpmPackage.GetInstalledSize() } else if action.GetActionType() == "fetch" { - ret += action.(*FetchPackageAction).RepositoryEntry.InstalledSize + ret += action.(*FetchPackageAction).DatabaseEntry.InstalledSize } } return ret @@ -116,7 +116,7 @@ func (operation *BPMOperation) GetFinalActionSize(rootDir string) int64 { ret -= int64(GetPackage(action.(*InstallPackageAction).BpmPackage.PkgInfo.Name, rootDir).GetInstalledSize()) } } else if action.GetActionType() == "fetch" { - ret += int64(action.(*FetchPackageAction).RepositoryEntry.InstalledSize) + ret += int64(action.(*FetchPackageAction).DatabaseEntry.InstalledSize) } else if action.GetActionType() == "remove" { ret -= int64(action.(*RemovePackageAction).BpmPackage.GetInstalledSize()) } @@ -133,7 +133,7 @@ func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, instal pkgInfo = action.BpmPackage.PkgInfo } else if value.GetActionType() == "fetch" { action := value.(*FetchPackageAction) - pkgInfo = action.RepositoryEntry.Info + pkgInfo = action.DatabaseEntry.Info } else { pos++ continue @@ -148,13 +148,13 @@ func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, instal if !reinstallDependencies && IsPackageInstalled(depend, operation.RootDir) { continue } - entry, _, err := GetRepositoryEntry(depend) + entry, _, err := GetDatabaseEntry(depend) if err != nil { - return errors.New("could not get repository entry for package (" + depend + ")") + return errors.New("could not get database entry for package (" + depend + ")") } operation.InsertActionAt(pos, &FetchPackageAction{ - IsDependency: true, - RepositoryEntry: entry, + IsDependency: true, + DatabaseEntry: entry, }) pos++ } @@ -263,7 +263,7 @@ func (operation *BPMOperation) ReplaceObsoletePackages() { } else if value.GetActionType() == "fetch" { action := value.(*FetchPackageAction) - pkgInfo = action.RepositoryEntry.Info + pkgInfo = action.DatabaseEntry.Info } else { continue } @@ -301,7 +301,7 @@ func (operation *BPMOperation) CheckForConflicts() (map[string][]string, error) allPackages = append(allPackages, pkgInfo) } else if value.GetActionType() == "fetch" { action := value.(*FetchPackageAction) - pkgInfo := action.RepositoryEntry.Info + pkgInfo := action.DatabaseEntry.Info allPackages = append(allPackages, pkgInfo) } else if value.GetActionType() == "remove" { action := value.(*RemovePackageAction) @@ -342,7 +342,7 @@ func (operation *BPMOperation) ShowOperationSummary() { pkgInfo = pkgInfo.GetSplitPackageInfo(value.(*InstallPackageAction).SplitPackageToInstall) } } else if value.GetActionType() == "fetch" { - pkgInfo = value.(*FetchPackageAction).RepositoryEntry.Info + pkgInfo = value.(*FetchPackageAction).DatabaseEntry.Info } else { pkgInfo = value.(*RemovePackageAction).BpmPackage.PkgInfo fmt.Printf("%s: %s (Remove)\n", pkgInfo.Name, pkgInfo.GetFullVersion()) @@ -414,11 +414,11 @@ func (operation *BPMOperation) RunHooks(verbose bool) error { } func (operation *BPMOperation) Execute(verbose, force bool) (err error) { - // Fetch packages from repositories + // Fetch packages from databases if slices.ContainsFunc(operation.Actions, func(action OperationAction) bool { return action.GetActionType() == "fetch" }) { - fmt.Println("Fetching packages from available repositories...") + fmt.Println("Fetching packages from available databases...") // Create map for fetched packages fetchedPackages := make(map[string]string) @@ -428,16 +428,16 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { continue } - // Get repository entry - entry := action.(*FetchPackageAction).RepositoryEntry + // Get database entry + entry := action.(*FetchPackageAction).DatabaseEntry // Create bpmpkg variable var bpmpkg *BPMPackage // Check if package has already been fetched from download link if _, ok := fetchedPackages[entry.Download]; !ok { - // Fetch package from repository - fetchedPackage, err := entry.Repository.FetchPackage(entry.Info.Name) + // Fetch package from database + fetchedPackage, err := entry.Database.FetchPackage(entry.Info.Name) if err != nil { return errors.New(fmt.Sprintf("could not fetch package (%s): %s\n", entry.Info.Name, err)) } @@ -596,8 +596,8 @@ func (action *InstallPackageAction) GetActionType() string { } type FetchPackageAction struct { - IsDependency bool - RepositoryEntry *RepositoryEntry + IsDependency bool + DatabaseEntry *BPMDatabaseEntry } func (action *FetchPackageAction) GetActionType() string { -- 2.47.2 From 966d351a801652da944f4ca3c9672230cdf890f7 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 15 May 2025 16:07:15 +0300 Subject: [PATCH 32/33] Readd make depends field to binary packages --- src/bpmlib/compilation.go | 3 +-- src/bpmlib/packages.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index f35b431..f8434e4 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -264,8 +264,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo pkgInfo.Arch = GetArch() } - // Remove source package specific fields - pkgInfo.MakeDepends = nil + // Remove split package field pkgInfo.SplitPackages = nil // Marshal package info diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 5c4471d..5cd21d6 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -466,8 +466,7 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) { pkgInfoClone := *pkgInfo pkgInfo.SplitPackages[i] = &pkgInfoClone - // Set make depends and split package field of split package to nil - pkgInfo.SplitPackages[i].MakeDepends = nil + // Set split package field of split package to nil pkgInfo.SplitPackages[i].SplitPackages = nil // Unmarshal json data back to struct -- 2.47.2 From 458c091ac2495e618ece4109d22631ba3e6e2236 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 23 May 2025 14:16:52 +0300 Subject: [PATCH 33/33] Add "make_dependency" installation reason --- config/bpm.conf | 1 + src/bpm/main.go | 30 ++++++++++++---- src/bpmlib/config.go | 13 ++++--- src/bpmlib/dependencies.go | 63 ++++++++++++++++++-------------- src/bpmlib/general.go | 44 +++++++++++------------ src/bpmlib/operations.go | 74 +++++++++++++++++++++----------------- src/bpmlib/packages.go | 23 +++++++++--- 7 files changed, 149 insertions(+), 99 deletions(-) diff --git a/config/bpm.conf b/config/bpm.conf index f32bc41..d594d35 100644 --- a/config/bpm.conf +++ b/config/bpm.conf @@ -1,6 +1,7 @@ ignore_packages: [] privilege_escalator_cmd: "sudo" compilation_env: [] +cleanup_make_dependencies: true databases: - name: example-database source: https://my-database.xyz/ diff --git a/src/bpm/main.go b/src/bpm/main.go index 329d8af..8de0e8e 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -44,6 +44,7 @@ var installSrcPkgDepends = false var skipChecks = false var outputDirectory = "" var cleanupDependencies = false +var cleanupMakeDependencies = false var cleanupCompilationFiles = false var cleanupCompiledPackages = false var cleanupFetchedPackages = false @@ -249,12 +250,14 @@ func resolveCommand() { } // Check if installationReason argument is valid - ir := bpmlib.InstallationReasonUnknown + ir := bpmlib.InstallationReasonManual switch installationReason { case "manual": ir = bpmlib.InstallationReasonManual case "dependency": ir = bpmlib.InstallationReasonDependency + case "make-dependency": + ir = bpmlib.InstallationReasonMakeDependency case "": default: log.Fatalf("Error: %s is not a valid installation reason", installationReason) @@ -467,7 +470,7 @@ func resolveCommand() { log.Fatalf("Error: could not complete cache cleanup: %s", err) } - if cleanupDependencies { + if cleanupDependencies || cleanupMakeDependencies { // Read local databases err := bpmlib.ReadLocalDatabaseFiles() if err != nil { @@ -475,7 +478,7 @@ func resolveCommand() { } // Create cleanup operation - operation, err := bpmlib.CleanupPackages(rootDir) + operation, err := bpmlib.CleanupPackages(cleanupMakeDependencies, rootDir) if errors.As(err, &bpmlib.PackageNotFoundErr{}) || errors.As(err, &bpmlib.DependencyNotFoundErr{}) || errors.As(err, &bpmlib.PackageConflictErr{}) { log.Fatalf("Error: %s", err) } else if err != nil { @@ -595,7 +598,7 @@ func resolveCommand() { // Get direct runtime and make dependencies totalDepends := make([]string, 0) - for _, depend := range bpmpkg.PkgInfo.GetDependencies(true, false) { + for depend := range bpmpkg.PkgInfo.GetDependencies(true, false) { if !slices.Contains(totalDepends, depend) { totalDepends = append(totalDepends, depend) } @@ -624,7 +627,7 @@ func resolveCommand() { } // Run 'bpm install' using the set privilege escalator command - args := []string{executable, "install", "--installation-reason=dependency"} + args := []string{executable, "install", "--installation-reason=make-dependency"} args = append(args, unmetDepends...) cmd := exec.Command(bpmlib.BPMConfig.PrivilegeEscalatorCmd, args...) if yesAll { @@ -777,6 +780,7 @@ func printHelp() { fmt.Println(" -R= lets you define the root path which will be used") fmt.Println(" -y skips the confirmation prompt") fmt.Println(" --depends performs a dependency cleanup") + fmt.Println(" --make-depends performs a make dependency cleanup") fmt.Println(" --compilation-files performs a cleanup of compilation files") fmt.Println(" --compiled-pkgs performs a cleanup of compilation compiled binary packages") fmt.Println(" --fetched-pkgs performs a cleanup of fetched packages from databases") @@ -843,6 +847,7 @@ func resolveFlags() { cleanupFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing") cleanupFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts") cleanupFlagSet.BoolVar(&cleanupDependencies, "depends", false, "Perform a dependency cleanup") + cleanupFlagSet.BoolVar(&cleanupMakeDependencies, "make-depends", false, "Perform a make dependency cleanup") cleanupFlagSet.BoolVar(&cleanupCompilationFiles, "compilation-files", false, "Perform a cleanup of compilation files") cleanupFlagSet.BoolVar(&cleanupCompiledPackages, "compiled-pkgs", false, "Perform a cleanup of compilation compiled binary packages") cleanupFlagSet.BoolVar(&cleanupFetchedPackages, "fetched-pkgs", false, "Perform a cleanup of fetched packages from databases") @@ -858,8 +863,18 @@ func resolveFlags() { compileFlagSet.StringVar(&outputDirectory, "o", "", "Set output directory") compileFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing") compileFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts") - compileFlagSet.Usage = printHelp + + isFlagSet := func(flagSet *flag.FlagSet, name string) bool { + found := false + flagSet.Visit(func(f *flag.Flag) { + if f.Name == name { + found = true + } + }) + return found + } + if len(os.Args[1:]) <= 0 { subcommand = "help" } else { @@ -906,8 +921,9 @@ func resolveFlags() { if err != nil { return } - if !cleanupDependencies && !cleanupCompilationFiles && !cleanupCompiledPackages && !cleanupFetchedPackages { + if !isFlagSet(cleanupFlagSet, "depends") && !isFlagSet(cleanupFlagSet, "make-depends") && !isFlagSet(cleanupFlagSet, "compilation-files") && !isFlagSet(cleanupFlagSet, "compiled-pkgs") && !isFlagSet(cleanupFlagSet, "fetched-pkgs") { cleanupDependencies = true + cleanupMakeDependencies = bpmlib.BPMConfig.CleanupMakeDependencies cleanupCompilationFiles = true cleanupCompiledPackages = true cleanupFetchedPackages = true diff --git a/src/bpmlib/config.go b/src/bpmlib/config.go index 0c24e57..e5f33c8 100644 --- a/src/bpmlib/config.go +++ b/src/bpmlib/config.go @@ -6,10 +6,11 @@ import ( ) type BPMConfigStruct struct { - IgnorePackages []string `yaml:"ignore_packages"` - PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"` - CompilationEnvironment []string `yaml:"compilation_env"` - Databases []*BPMDatabase `yaml:"databases"` + IgnorePackages []string `yaml:"ignore_packages"` + PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"` + CompilationEnvironment []string `yaml:"compilation_env"` + CleanupMakeDependencies bool `yaml:"cleanup_make_dependencies"` + Databases []*BPMDatabase `yaml:"databases"` } var BPMConfig BPMConfigStruct @@ -24,7 +25,9 @@ func ReadConfig() (err error) { return err } - BPMConfig = BPMConfigStruct{} + BPMConfig = BPMConfigStruct{ + CleanupMakeDependencies: true, + } err = yaml.Unmarshal(bytes, &BPMConfig) if err != nil { return err diff --git a/src/bpmlib/dependencies.go b/src/bpmlib/dependencies.go index f349903..d55a6a0 100644 --- a/src/bpmlib/dependencies.go +++ b/src/bpmlib/dependencies.go @@ -6,14 +6,25 @@ import ( "slices" ) -func (pkgInfo *PackageInfo) GetDependencies(includeMakeDepends, includeOptionalDepends bool) []string { - allDepends := make([]string, 0) - allDepends = append(allDepends, pkgInfo.Depends...) - if includeMakeDepends { - allDepends = append(allDepends, pkgInfo.MakeDepends...) +func (pkgInfo *PackageInfo) GetDependencies(includeMakeDepends, includeOptionalDepends bool) map[string]InstallationReason { + allDepends := make(map[string]InstallationReason) + + for _, depend := range pkgInfo.Depends { + allDepends[depend] = InstallationReasonDependency } if includeOptionalDepends { - allDepends = append(allDepends, pkgInfo.OptionalDepends...) + for _, depend := range pkgInfo.OptionalDepends { + if _, ok := allDepends[depend]; !ok { + allDepends[depend] = InstallationReasonDependency + } + } + } + if includeMakeDepends { + for _, depend := range pkgInfo.MakeDepends { + if _, ok := allDepends[depend]; !ok { + allDepends[depend] = InstallationReasonMakeDependency + } + } } return allDepends } @@ -34,7 +45,10 @@ func (pkgInfo *PackageInfo) getAllDependencies(resolved *[]string, unresolved *[ *unresolved = append(*unresolved, pkgInfo.Name) // Loop through all dependencies - for _, depend := range pkgInfo.GetDependencies(includeMakeDepends, includeOptionalDepends) { + for depend := range pkgInfo.GetDependencies(includeMakeDepends, includeOptionalDepends) { + if isVirtual, p := IsVirtualPackage(depend, rootDir); isVirtual { + depend = p + } if !slices.Contains(*resolved, depend) { // Add current dependency to resolved slice when circular dependency is detected if slices.Contains(*unresolved, depend) { @@ -44,13 +58,7 @@ func (pkgInfo *PackageInfo) getAllDependencies(resolved *[]string, unresolved *[ continue } - var dependInfo *PackageInfo - - if isVirtual, p := IsVirtualPackage(depend, rootDir); isVirtual { - dependInfo = GetPackageInfo(p, rootDir) - } else { - dependInfo = GetPackageInfo(depend, rootDir) - } + dependInfo := GetPackageInfo(depend, rootDir) if dependInfo != nil { dependInfo.getAllDependencies(resolved, unresolved, includeMakeDepends, includeOptionalDepends, rootDir) @@ -63,31 +71,31 @@ func (pkgInfo *PackageInfo) getAllDependencies(resolved *[]string, unresolved *[ *unresolved = stringSliceRemove(*unresolved, pkgInfo.Name) } -func ResolvePackageDependenciesFromDatabases(pkgInfo *PackageInfo, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) (resolved []string, unresolved []string) { +func ResolveAllPackageDependenciesFromDatabases(pkgInfo *PackageInfo, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) (resolved map[string]InstallationReason, unresolved []string) { // Initialize slices - resolved = make([]string, 0) + resolved = make(map[string]InstallationReason) unresolved = make([]string, 0) // Call unexported function - resolvePackageDependenciesFromDatabase(&resolved, &unresolved, pkgInfo, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) + resolvePackageDependenciesFromDatabase(resolved, &unresolved, pkgInfo, InstallationReasonDependency, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) return resolved, unresolved } -func resolvePackageDependenciesFromDatabase(resolved, unresolved *[]string, pkgInfo *PackageInfo, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) { +func resolvePackageDependenciesFromDatabase(resolved map[string]InstallationReason, unresolved *[]string, pkgInfo *PackageInfo, installationReason InstallationReason, checkMake, checkOptional, ignoreInstalled, verbose bool, rootDir string) { // Add current package name to unresolved slice *unresolved = append(*unresolved, pkgInfo.Name) // Loop through all dependencies - for _, depend := range pkgInfo.GetDependencies(checkMake, checkOptional) { - if !slices.Contains(*resolved, depend) { + for depend, ir := range pkgInfo.GetDependencies(pkgInfo.Type == "source", checkOptional) { + if _, ok := resolved[depend]; !ok { // Add current dependency to resolved slice when circular dependency is detected 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) + if _, ok := resolved[depend]; !ok { + resolved[depend] = ir } continue } else if ignoreInstalled && IsPackageProvided(depend, rootDir) { @@ -104,11 +112,12 @@ func resolvePackageDependenciesFromDatabase(resolved, unresolved *[]string, pkgI continue } } - resolvePackageDependenciesFromDatabase(resolved, unresolved, entry.Info, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) + resolvePackageDependenciesFromDatabase(resolved, unresolved, entry.Info, ir, checkMake, checkOptional, ignoreInstalled, verbose, rootDir) } } - if !slices.Contains(*resolved, pkgInfo.Name) { - *resolved = append(*resolved, pkgInfo.Name) + + if _, ok := resolved[pkgInfo.Name]; !ok { + resolved[pkgInfo.Name] = installationReason } *unresolved = stringSliceRemove(*unresolved, pkgInfo.Name) } @@ -145,7 +154,7 @@ func GetPackageDependants(pkgName string, rootDir string) ([]string, error) { dependencies := installedPkg.PkgInfo.GetDependencies(false, true) // Add installed package to list if its dependencies include pkgName - if slices.Contains(dependencies, pkgName) { + if _, ok := dependencies[pkgName]; ok { ret = append(ret, installedPkgName) continue } @@ -153,7 +162,7 @@ func GetPackageDependants(pkgName string, rootDir string) ([]string, error) { // Loop through each virtual package for _, vpkg := range pkg.PkgInfo.Provides { // Add installed package to list if its dependencies contain a provided virtual package - if slices.Contains(dependencies, vpkg) { + if _, ok := dependencies[vpkg]; ok { ret = append(ret, installedPkgName) break } diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index 8e28e05..ff80caa 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -21,12 +21,11 @@ const ( func InstallPackages(rootDir string, installationReason InstallationReason, reinstallMethod ReinstallMethod, installOptionalDependencies, forceInstallation, verbose bool, packages ...string) (operation *BPMOperation, err error) { // Setup operation struct operation = &BPMOperation{ - Actions: make([]OperationAction, 0), - UnresolvedDepends: make([]string, 0), - Changes: make(map[string]string), - RootDir: rootDir, - ForceInstallationReason: installationReason, - compiledPackages: make(map[string]string), + Actions: make([]OperationAction, 0), + UnresolvedDepends: make([]string, 0), + Changes: make(map[string]string), + RootDir: rootDir, + compiledPackages: make(map[string]string), } // Resolve packages @@ -46,7 +45,7 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein operation.AppendAction(&InstallPackageAction{ File: pkg, - IsDependency: false, + InstallationReason: installationReason, BpmPackage: bpmpkg, SplitPackageToInstall: splitPkg.Name, }) @@ -59,9 +58,9 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein } operation.AppendAction(&InstallPackageAction{ - File: pkg, - IsDependency: false, - BpmPackage: bpmpkg, + File: pkg, + InstallationReason: installationReason, + BpmPackage: bpmpkg, }) } else { var entry *BPMDatabaseEntry @@ -85,8 +84,8 @@ func InstallPackages(rootDir string, installationReason InstallationReason, rein } operation.AppendAction(&FetchPackageAction{ - IsDependency: false, - DatabaseEntry: entry, + InstallationReason: installationReason, + DatabaseEntry: entry, }) } } @@ -161,7 +160,7 @@ func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencie // Do package cleanup if cleanupDependencies { - err := operation.Cleanup() + err := operation.Cleanup(true) if err != nil { return nil, fmt.Errorf("could not perform cleanup for operation: %s", err) } @@ -170,7 +169,7 @@ func RemovePackages(rootDir string, removeUnusedPackagesOnly, cleanupDependencie } // CleanupPackages finds packages installed as dependencies which are no longer required by the rest of the system in the given root directory -func CleanupPackages(rootDir string) (operation *BPMOperation, err error) { +func CleanupPackages(cleanupMakeDepends bool, rootDir string) (operation *BPMOperation, err error) { operation = &BPMOperation{ Actions: make([]OperationAction, 0), UnresolvedDepends: make([]string, 0), @@ -180,7 +179,7 @@ func CleanupPackages(rootDir string) (operation *BPMOperation, err error) { } // Do package cleanup - err = operation.Cleanup() + err = operation.Cleanup(cleanupMakeDepends) if err != nil { return nil, fmt.Errorf("could not perform cleanup for operation: %s", err) } @@ -300,12 +299,11 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci } operation = &BPMOperation{ - Actions: make([]OperationAction, 0), - UnresolvedDepends: make([]string, 0), - Changes: make(map[string]string), - RootDir: rootDir, - ForceInstallationReason: InstallationReasonUnknown, - compiledPackages: make(map[string]string), + Actions: make([]OperationAction, 0), + UnresolvedDepends: make([]string, 0), + Changes: make(map[string]string), + RootDir: rootDir, + compiledPackages: make(map[string]string), } // Search for packages @@ -328,8 +326,8 @@ func UpdatePackages(rootDir string, syncDatabase bool, installOptionalDependenci comparison := ComparePackageVersions(*entry.Info, *installedInfo) if comparison > 0 { operation.AppendAction(&FetchPackageAction{ - IsDependency: false, - DatabaseEntry: entry, + InstallationReason: GetInstallationReason(pkg, rootDir), + DatabaseEntry: entry, }) } } diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index de03e30..8e4ef23 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -11,12 +11,11 @@ import ( ) type BPMOperation struct { - Actions []OperationAction - UnresolvedDepends []string - Changes map[string]string - RootDir string - ForceInstallationReason InstallationReason - compiledPackages map[string]string + Actions []OperationAction + UnresolvedDepends []string + Changes map[string]string + RootDir string + compiledPackages map[string]string } func (operation *BPMOperation) ActionsContainPackage(pkg string) bool { @@ -139,11 +138,11 @@ func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, instal continue } - resolved, unresolved := ResolvePackageDependenciesFromDatabases(pkgInfo, pkgInfo.Type == "source", installOptionalDependencies, !reinstallDependencies, verbose, operation.RootDir) + resolved, unresolved := ResolveAllPackageDependenciesFromDatabases(pkgInfo, pkgInfo.Type == "source", installOptionalDependencies, !reinstallDependencies, verbose, operation.RootDir) operation.UnresolvedDepends = append(operation.UnresolvedDepends, unresolved...) - for _, depend := range resolved { + for depend, installationReason := range resolved { if !operation.ActionsContainPackage(depend) && depend != pkgInfo.Name { if !reinstallDependencies && IsPackageInstalled(depend, operation.RootDir) { continue @@ -153,8 +152,8 @@ func (operation *BPMOperation) ResolveDependencies(reinstallDependencies, instal return errors.New("could not get database entry for package (" + depend + ")") } operation.InsertActionAt(pos, &FetchPackageAction{ - IsDependency: true, - DatabaseEntry: entry, + InstallationReason: installationReason, + DatabaseEntry: entry, }) pos++ } @@ -192,7 +191,7 @@ func (operation *BPMOperation) RemoveNeededPackages() error { return nil } -func (operation *BPMOperation) Cleanup() error { +func (operation *BPMOperation) Cleanup(cleanupMakeDepends bool) error { // Get all installed packages installedPackageNames, err := GetInstalledPackages(operation.RootDir) if err != nil { @@ -228,7 +227,7 @@ func (operation *BPMOperation) Cleanup() error { } keepPackages = append(keepPackages, pkg.Name) - resolved := pkg.GetAllDependencies(false, true, operation.RootDir) + resolved := pkg.GetAllDependencies(!cleanupMakeDepends, true, operation.RootDir) for _, value := range resolved { if !slices.Contains(keepPackages, value) { keepPackages = append(keepPackages, value) @@ -336,12 +335,15 @@ func (operation *BPMOperation) ShowOperationSummary() { for _, value := range operation.Actions { var pkgInfo *PackageInfo + var installationReason = InstallationReasonUnknown if value.GetActionType() == "install" { + installationReason = value.(*InstallPackageAction).InstallationReason pkgInfo = value.(*InstallPackageAction).BpmPackage.PkgInfo if value.(*InstallPackageAction).SplitPackageToInstall != "" { pkgInfo = pkgInfo.GetSplitPackageInfo(value.(*InstallPackageAction).SplitPackageToInstall) } } else if value.GetActionType() == "fetch" { + installationReason = value.(*FetchPackageAction).InstallationReason pkgInfo = value.(*FetchPackageAction).DatabaseEntry.Info } else { pkgInfo = value.(*RemovePackageAction).BpmPackage.PkgInfo @@ -350,21 +352,32 @@ func (operation *BPMOperation) ShowOperationSummary() { } installedInfo := GetPackageInfo(pkgInfo.Name, operation.RootDir) - sourceInfo := "" + additionalInfo := "" + switch installationReason { + case InstallationReasonManual: + additionalInfo = "(Manual)" + case InstallationReasonDependency: + additionalInfo = "(Dependency)" + case InstallationReasonMakeDependency: + additionalInfo = "(Make dependency)" + default: + additionalInfo = "(Unknown)" + } + if pkgInfo.Type == "source" { - sourceInfo = "(From Source)" + additionalInfo += " (From Source)" } if installedInfo == nil { - fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo) + fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), additionalInfo) } else { comparison := ComparePackageVersions(*pkgInfo, *installedInfo) if comparison < 0 { - fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) + fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), additionalInfo) } else if comparison > 0 { - fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) + fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), additionalInfo) } else { - fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo) + fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), additionalInfo) } } } @@ -465,15 +478,15 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { if bpmpkg.PkgInfo.IsSplitPackage() { operation.Actions[i] = &InstallPackageAction{ File: fetchedPackages[entry.Download], - IsDependency: action.(*FetchPackageAction).IsDependency, + InstallationReason: action.(*FetchPackageAction).InstallationReason, BpmPackage: bpmpkg, SplitPackageToInstall: entry.Info.Name, } } else { operation.Actions[i] = &InstallPackageAction{ - File: fetchedPackages[entry.Download], - IsDependency: action.(*FetchPackageAction).IsDependency, - BpmPackage: bpmpkg, + File: fetchedPackages[entry.Download], + InstallationReason: action.(*FetchPackageAction).InstallationReason, + BpmPackage: bpmpkg, } } } @@ -553,7 +566,7 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { } } - if value.IsDependency { + if value.InstallationReason != InstallationReasonManual { err = installPackage(fileToInstall, operation.RootDir, verbose, true) } else { err = installPackage(fileToInstall, operation.RootDir, verbose, force) @@ -561,13 +574,8 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { if err != nil { return errors.New(fmt.Sprintf("could not install package (%s): %s\n", bpmpkg.PkgInfo.Name, err)) } - if operation.ForceInstallationReason != InstallationReasonUnknown && !value.IsDependency { - err := SetInstallationReason(bpmpkg.PkgInfo.Name, operation.ForceInstallationReason, 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)) - } - } else if value.IsDependency && !isReinstall { - err := SetInstallationReason(bpmpkg.PkgInfo.Name, InstallationReasonDependency, operation.RootDir) + if !isReinstall { + err := SetInstallationReason(bpmpkg.PkgInfo.Name, value.InstallationReason, 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)) } @@ -586,7 +594,7 @@ type OperationAction interface { type InstallPackageAction struct { File string - IsDependency bool + InstallationReason InstallationReason SplitPackageToInstall string BpmPackage *BPMPackage } @@ -596,8 +604,8 @@ func (action *InstallPackageAction) GetActionType() string { } type FetchPackageAction struct { - IsDependency bool - DatabaseEntry *BPMDatabaseEntry + InstallationReason InstallationReason + DatabaseEntry *BPMDatabaseEntry } func (action *FetchPackageAction) GetActionType() string { diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 5cd21d6..ce69858 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -92,9 +92,10 @@ func (pkgInfo *PackageInfo) GetSplitPackageInfo(splitPkg string) *PackageInfo { type InstallationReason string const ( - InstallationReasonManual InstallationReason = "manual" - InstallationReasonDependency InstallationReason = "dependency" - InstallationReasonUnknown InstallationReason = "unknown" + InstallationReasonManual InstallationReason = "manual" + InstallationReasonDependency InstallationReason = "dependency" + InstallationReasonMakeDependency InstallationReason = "make_dependency" + InstallationReasonUnknown InstallationReason = "unknown" ) func ComparePackageVersions(info1, info2 PackageInfo) int { @@ -119,6 +120,8 @@ func GetInstallationReason(pkg, rootDir string) InstallationReason { return InstallationReasonManual } else if reason == "dependency" { return InstallationReasonDependency + } else if reason == "make_dependency" { + return InstallationReasonMakeDependency } return InstallationReasonUnknown } @@ -524,7 +527,19 @@ func CreateReadableInfo(showArchitecture, showType, showPackageRelations, showIn appendArray("Split Packages", splitPkgs) } if IsPackageInstalled(pkgInfo.Name, rootDir) && showInstallationReason { - ret = append(ret, "Installation Reason: "+string(GetInstallationReason(pkgInfo.Name, rootDir))) + installationReason := GetInstallationReason(pkgInfo.Name, rootDir) + var installationReasonString string + switch installationReason { + case InstallationReasonManual: + installationReasonString = "Manual" + case InstallationReasonDependency: + installationReasonString = "Dependency" + case InstallationReasonMakeDependency: + installationReasonString = "Make dependency" + default: + installationReasonString = "Unknown" + } + ret = append(ret, "Installation Reason: "+installationReasonString) } return strings.Join(ret, "\n") } -- 2.47.2