bubble-package-manager/bpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified CheckDependencies and CheckMakeDependencies functions

Browse Source
This commit is contained in:
CapCreeperGR 2024-07-01 13:06:26 +03:00
parent 9927c7f7ef
commit 124802ecc1
1 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
bpm_utils/package_utils.go
View File

@ -1126,80 +1126,20 @@ func GetSourceScript(filename string) (string, error) {
} }
func CheckDependencies(pkgInfo *PackageInfo, rootDir string) []string { func CheckDependencies(pkgInfo *PackageInfo, rootDir string) []string {
unresolved := make([]string, len(pkgInfo.Depends)) var unresolved []string
copy(unresolved, pkgInfo.Depends) for _, dependency := range pkgInfo.Depends {
installedDir := path.Join(rootDir, "var/lib/bpm/installed/") if !IsPackageInstalled(dependency, rootDir) {
if _, err := os.Stat(installedDir); err != nil { unresolved = append(unresolved, dependency)
return nil
}
items, err := os.ReadDir(installedDir)
if err != nil {
return nil
}
for _, item := range items {
if !item.IsDir() {
continue
}
_, err := os.Stat(path.Join(installedDir, item.Name(), "/info"))
if err != nil {
return nil
}
bs, err := os.ReadFile(path.Join(installedDir, item.Name(), "/info"))
if err != nil {
return nil
}
info, err := ReadPackageInfo(string(bs), false)
if err != nil {
return nil
}
if slices.Contains(unresolved, info.Name) {
unresolved = stringSliceRemove(unresolved, info.Name)
}
for _, prov := range info.Provides {
if slices.Contains(unresolved, prov) {
unresolved = stringSliceRemove(unresolved, prov)
}
} }
} }
return unresolved return unresolved
} }
func CheckMakeDependencies(pkgInfo *PackageInfo, rootDir string) []string { func CheckMakeDependencies(pkgInfo *PackageInfo, rootDir string) []string {
unresolved := make([]string, len(pkgInfo.MakeDepends)) var unresolved []string
copy(unresolved, pkgInfo.MakeDepends) for _, dependency := range pkgInfo.MakeDepends {
installedDir := path.Join(rootDir, "var/lib/bpm/installed/") if !IsPackageInstalled(dependency, "/") {
if _, err := os.Stat(installedDir); err != nil { unresolved = append(unresolved, dependency)
return nil
}
items, err := os.ReadDir(installedDir)
if err != nil {
return nil
}
for _, item := range items {
if !item.IsDir() {
continue
}
_, err := os.Stat(path.Join(installedDir, item.Name(), "/info"))
if err != nil {
return nil
}
bs, err := os.ReadFile(path.Join(installedDir, item.Name(), "/info"))
if err != nil {
return nil
}
info, err := ReadPackageInfo(string(bs), false)
if err != nil {
return nil
}
if slices.Contains(unresolved, info.Name) {
unresolved = stringSliceRemove(unresolved, info.Name)
}
for _, prov := range info.Provides {
if slices.Contains(unresolved, prov) {
unresolved = stringSliceRemove(unresolved, prov)
}
} }
} }
return unresolved return unresolved