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

Minor Update to patch bug with AUR logic appending .git to package names

Browse Source
This commit is contained in:
VetheonGames 2024-01-08 15:18:41 -07:00
parent 3ddd1336c0
commit 2697ad9b1c
2 changed files with 24 additions and 8 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 AllPac V0.9.1

30
pkg/packagemanager/install.go
View File

@ -6,6 +6,7 @@ package packagemanager
import ( import (
"fmt" "fmt"
"time"
"os" "os"
"os/exec" "os/exec"
"os/user" "os/user"
@ -116,6 +117,7 @@ func CloneAndInstallFromAUR(repoURL string, skipConfirmation bool) (string, erro
logger.Warnf("user aborted the action") logger.Warnf("user aborted the action")
return "", fmt.Errorf("user aborted the action") return "", fmt.Errorf("user aborted the action")
} }
// Get the current user's home directory // Get the current user's home directory
usr, err := user.Current() usr, err := user.Current()
if err != nil { if err != nil {
@ -123,6 +125,24 @@ func CloneAndInstallFromAUR(repoURL string, skipConfirmation bool) (string, erro
return "", fmt.Errorf("error getting current user: %v", err) return "", fmt.Errorf("error getting current user: %v", err)
} }
// Determine the name of the package from the repo URL
repoName := filepath.Base(repoURL)
// Remove .git suffix
repoName = strings.TrimSuffix(repoName, ".git")
// Get the current date in YYYYMMDD format
currentDate := time.Now().Format("20060102")
// Define the directory for this specific package clone
cloneDir := filepath.Join(usr.HomeDir, ".allpac", "cache", repoName+"-"+currentDate)
// Ensure the clone directory exists
if err := os.MkdirAll(cloneDir, 0755); err != nil {
logger.Errorf("error creating clone directory: %v", err)
return "", fmt.Errorf("error creating clone directory: %v", err)
}
// Define the base directory for AllPac cache // Define the base directory for AllPac cache
baseDir := filepath.Join(usr.HomeDir, ".allpac", "cache") baseDir := filepath.Join(usr.HomeDir, ".allpac", "cache")
@ -133,18 +153,14 @@ func CloneAndInstallFromAUR(repoURL string, skipConfirmation bool) (string, erro
} }
// Clone the repository // Clone the repository
cmdGitClone := exec.Command("git", "clone", repoURL, baseDir) cmdGitClone := exec.Command("git", "clone", repoURL, cloneDir)
if output, err := cmdGitClone.CombinedOutput(); err != nil { if output, err := cmdGitClone.CombinedOutput(); err != nil {
logger.Errorf("error cloning AUR repo: %s, %v", output, err) logger.Errorf("error cloning AUR repo: %s, %v", output, err)
return "", fmt.Errorf("error cloning AUR repo: %s, %v", output, err) return "", fmt.Errorf("error cloning AUR repo: %s, %v", output, err)
} }
// Determine the name of the created directory (and the package name)
repoName := filepath.Base(repoURL)
repoDir := filepath.Join(baseDir, repoName)
// Change directory to the cloned repository // Change directory to the cloned repository
if err := os.Chdir(repoDir); err != nil { if err := os.Chdir(cloneDir); err != nil {
logger.Errorf("error changing directory: %v", err) logger.Errorf("error changing directory: %v", err)
return "", fmt.Errorf("error changing directory: %v", err) return "", fmt.Errorf("error changing directory: %v", err)
} }
@ -157,7 +173,7 @@ func CloneAndInstallFromAUR(repoURL string, skipConfirmation bool) (string, erro
} }
// Extract the version from PKGBUILD // Extract the version from PKGBUILD
version, err := ExtractVersionFromPKGBUILD(repoDir) version, err := ExtractVersionFromPKGBUILD(cloneDir)
if err != nil { if err != nil {
logger.Errorf("error extracting version from PKGBUILD: %v", err) logger.Errorf("error extracting version from PKGBUILD: %v", err)
return "", fmt.Errorf("error extracting version from PKGBUILD: %v", err) return "", fmt.Errorf("error extracting version from PKGBUILD: %v", err)