From 2db01fb0d439bac44ace93863d9656efd76f5c18 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Thu, 23 Oct 2025 19:42:09 +0300 Subject: [PATCH] Disable tar verbose mode by default --- src/bpm/main.go | 2 +- src/bpmlib/compilation.go | 11 +++++++---- src/bpmlib/operations.go | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/bpm/main.go b/src/bpm/main.go index e1e9426..34b87b0 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -1213,7 +1213,7 @@ func compilePackage() { return } - outputBpmPackages, err := bpmlib.CompileSourcePackage(sourcePackage, outputDirectory, skipChecks, keepCompilationFiles) + outputBpmPackages, err := bpmlib.CompileSourcePackage(sourcePackage, outputDirectory, skipChecks, keepCompilationFiles, verbose) if err != nil { // Remove unused packages cleanupFunc() diff --git a/src/bpmlib/compilation.go b/src/bpmlib/compilation.go index f71a23e..84de1d2 100644 --- a/src/bpmlib/compilation.go +++ b/src/bpmlib/compilation.go @@ -21,7 +21,7 @@ import ( var rootCompilationUID = "65534" var rootCompilationGID = "65534" -func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks, keepCompilationFiles bool) (outputBpmPackages map[string]string, err error) { +func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks, keepCompilationFiles, verbose bool) (outputBpmPackages map[string]string, err error) { // Initialize map outputBpmPackages = make(map[string]string) @@ -122,7 +122,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks, k } // Download files - err = downloadPackageFiles(bpmpkg.PkgInfo, tempDirectory) + err = downloadPackageFiles(bpmpkg.PkgInfo, tempDirectory, verbose) if err != nil { return nil, err } @@ -342,7 +342,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks, k return outputBpmPackages, nil } -func downloadPackageFiles(pkgInfo *PackageInfo, tempDirectory string) error { +func downloadPackageFiles(pkgInfo *PackageInfo, tempDirectory string, verbose bool) error { for _, download := range pkgInfo.Downloads { // Replace variables replaceVars := func(s string) string { @@ -414,7 +414,10 @@ func downloadPackageFiles(pkgInfo *PackageInfo, tempDirectory string) error { } if !download.NoExtract && (strings.Contains(filepath, ".tar") || strings.HasSuffix(filepath, ".tgz")) { - cmd := exec.Command("tar", "xvf", filepath, "--strip-components="+strconv.Itoa(download.ExtractStripComponents)) + cmd := exec.Command("tar", "xf", filepath, "--strip-components="+strconv.Itoa(download.ExtractStripComponents)) + if verbose { + cmd.Args[1] = "xvf" + } cmd.Dir = tempDirectory if extractTo != "" { err := os.MkdirAll(extractTo, 0755) diff --git a/src/bpmlib/operations.go b/src/bpmlib/operations.go index fae8bf7..7f1e22c 100644 --- a/src/bpmlib/operations.go +++ b/src/bpmlib/operations.go @@ -589,7 +589,7 @@ func (operation *BPMOperation) Execute(verbose, force bool) (err error) { // Compile source package if not compiled already if _, ok := operation.compiledPackages[pkgNameToInstall]; !ok { - outputBpmPackages, err := CompileSourcePackage(value.File, compiledDir, false, false) + outputBpmPackages, err := CompileSourcePackage(value.File, compiledDir, false, false, verbose) if err != nil { return fmt.Errorf("could not compile source package (%s): %s\n", value.File, err) }