PixelRidge-Softworks/AllPac
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Minor Patch, finally fixed AUR building so that makepkg's environment handling doesn't crash AllPac

Browse Source
This commit is contained in:
VetheonGames 2024-01-08 17:27:22 -07:00
parent 409345289e
commit 28c3d57dec
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/.version
View File

@ -1 +1 @@
AllPac V0.9.5
AllPac V0.9.8

12
pkg/packagemanager/install.go
View File

@ -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)