From 28c3d57dec9faa749c7154ac1cb93401647d87b7 Mon Sep 17 00:00:00 2001
From: VetheonGames <ceo@pixelatedstudios.net>
Date: Mon, 8 Jan 2024 17:27:22 -0700
Subject: [PATCH] Minor Patch, finally fixed AUR building so that makepkg's
 environment handling doesn't crash AllPac

---
 cmd/.version                  |  2 +-
 pkg/packagemanager/install.go | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmd/.version b/cmd/.version
index 669f27a..9dfc1ba 100644
--- a/cmd/.version
+++ b/cmd/.version
@@ -1 +1 @@
-AllPac V0.9.5
+AllPac V0.9.8
diff --git a/pkg/packagemanager/install.go b/pkg/packagemanager/install.go
index 173979b..4b0da23 100644
--- a/pkg/packagemanager/install.go
+++ b/pkg/packagemanager/install.go
@@ -165,9 +165,19 @@ func CloneAndInstallFromAUR(repoURL string, skipConfirmation bool) (string, erro
         return "", fmt.Errorf("error changing directory: %v", err)
     }
 
+    // Append environment variables to PKGBUILD
+    cmdAppendEnv := exec.Command("bash", "-c", "echo 'export HOME=$HOME' >> PKGBUILD && echo 'export GOCACHE=$HOME/.cache/go-build' >> PKGBUILD")
+    cmdAppendEnv.Dir = cloneDir  // Set the working directory to the cloned repository
+    if _, err := cmdAppendEnv.CombinedOutput(); err != nil {
+        logger.Errorf("error appending environment variables to PKGBUILD: %v", err)
+        return "", fmt.Errorf("error appending environment variables to PKGBUILD: %v", err)
+    }
+
     // Build the package using makepkg as the non-root user
+    env := append(os.Environ(), "HOME=" + usr.HomeDir)
     cmdMakePkg := exec.Command("makepkg", "-si", "--noconfirm")
-    cmdMakePkg.Env = []string{"PATH=" + os.Getenv("PATH")}
+    cmdMakePkg.Env = env
+    cmdMakePkg.Dir = cloneDir
     if output, err := cmdMakePkg.CombinedOutput(); err != nil {
         logger.Errorf("error building package with makepkg: %s, %v", output, err)
         return "", fmt.Errorf("error building package with makepkg: %s, %v", output, err)