From 3cfb31433395b5eb1820985a26f65a26fd9bb126 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Thu, 4 Sep 2025 12:01:59 +0300
Subject: [PATCH] Improve package compilation and installation handling

---
 src/bpm-package/go.mod  |  5 ++--
 src/bpm-package/go.sum  |  1 +
 src/bpm-package/main.go | 55 +++++++++++++++++++----------------------
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/bpm-package/go.mod b/src/bpm-package/go.mod
index e0e3276..1ea9f14 100644
--- a/src/bpm-package/go.mod
+++ b/src/bpm-package/go.mod
@@ -2,7 +2,8 @@ module git.enumerated.dev/bubble-package-manager/bpm-utils/src/bpm-package
 
 go 1.23
 
-require gopkg.in/yaml.v3 v3.0.1 // indirect
+require gopkg.in/yaml.v3 v3.0.1
+
 require bpm-utils-shared v1.0.0
 
-replace bpm-utils-shared => ../bpm-utils-shared
\ No newline at end of file
+replace bpm-utils-shared => ../bpm-utils-shared
diff --git a/src/bpm-package/go.sum b/src/bpm-package/go.sum
index 4bc0337..a62c313 100644
--- a/src/bpm-package/go.sum
+++ b/src/bpm-package/go.sum
@@ -1,3 +1,4 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/bpm-package/main.go b/src/bpm-package/main.go
index d31dcab..d12a9b9 100644
--- a/src/bpm-package/main.go
+++ b/src/bpm-package/main.go
@@ -2,16 +2,16 @@ package main
 
 import (
 	bpmutilsshared "bpm-utils-shared"
-	"bufio"
 	"flag"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"io"
 	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+
+	"gopkg.in/yaml.v3"
 )
 
 var compile = flag.Bool("c", false, "Compile BPM source package")
@@ -127,14 +127,23 @@ func compilePackage(archive string) {
 	if *yesAll {
 		args = append(args, "-y")
 	}
+	if *installPackage {
+		args = append(args, "--fd=3")
+	}
 	args = append(args, archive)
 	cmd := exec.Command("bpm", args...)
 	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	pipe, err := cmd.StdoutPipe()
+
+	// Set output pipe for file descriptor 3
+	cmdOutputReader, cmdOutputWriter, err := os.Pipe()
 	if err != nil {
-		log.Fatalf("Error: could not setup stdout pipe: %s", err)
+		log.Fatalf("Error: failed to create pipe: %s", err)
 	}
+	defer cmdOutputReader.Close()
+	defer cmdOutputWriter.Close()
+	cmd.ExtraFiles = append(cmd.ExtraFiles, cmdOutputWriter)
 
 	// Run command
 	err = cmd.Start()
@@ -142,37 +151,25 @@ func compilePackage(archive string) {
 		log.Fatalf("Error: failed to compile BPM source package: %s", err)
 	}
 
-	// Print command output and store it in variable
-	pipeOutput := ""
-	buf := bufio.NewReader(pipe)
-	for {
-		b, err := buf.ReadByte()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			log.Fatalf("Error: failed to read byte from command: %s", err)
-		}
-
-		pipeOutput += string(b)
-		fmt.Print(string(b))
-	}
-	fmt.Println()
-
-	// Put output file into slice
-	outputFiles := make([]string, 0)
-	for _, line := range strings.Split(pipeOutput, "\n") {
-		if strings.Contains(line, "Binary package generated at: ") {
-			path := strings.TrimSpace(strings.SplitN(line, ":", 2)[1])
-			outputFiles = append(outputFiles, path)
-		}
-	}
-
 	// Wait for process to complete
 	err = cmd.Wait()
 	if err != nil {
 		log.Fatalf("Error: failed to compile BPM source package: %s", err)
 	}
 
+	// Read cmd output
+	cmdOutputWriter.Close()
+	cmdOutput, err := io.ReadAll(cmdOutputReader)
+	if err != nil {
+		log.Fatalf("Error: failed to get cmd output: %s", err)
+	}
+
+	// Put output file into slice
+	outputFiles := make([]string, 0)
+	for _, line := range strings.Split(strings.TrimSpace(string(cmdOutput)), "\n") {
+		outputFiles = append(outputFiles, line)
+	}
+
 	// Install compiled packages
 	if *installPackage && len(outputFiles) != 0 {
 		// Read BPM utils config