Switched to using yaml for package metadata and added verbose flag
This commit is contained in:
parent
c20e74203c
commit
c85c9b5d1c
@ -6,6 +6,7 @@ import (
|
|||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
@ -19,17 +20,23 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type PackageInfo struct {
|
type PackageInfo struct {
|
||||||
Name string
|
Name string `yaml:"name,omitempty"`
|
||||||
Description string
|
Description string `yaml:"description,omitempty"`
|
||||||
Version string
|
Version string `yaml:"version,omitempty"`
|
||||||
Url string
|
Url string `yaml:"url,omitempty"`
|
||||||
License string
|
License string `yaml:"license,omitempty"`
|
||||||
Arch string
|
Arch string `yaml:"architecture,omitempty"`
|
||||||
Type string
|
Type string `yaml:"type,omitempty"`
|
||||||
Keep []string
|
Keep []string `yaml:"keep,omitempty"`
|
||||||
Depends []string
|
Depends []string `yaml:"depends,omitempty"`
|
||||||
MakeDepends []string
|
ConditionalDepends map[string][]string `yaml:"conditional_depends,omitempty"`
|
||||||
Provides []string
|
MakeDepends []string `yaml:"make_depends,omitempty"`
|
||||||
|
ConditionalMakeDepends map[string][]string `yaml:"conditional_make_depends,omitempty"`
|
||||||
|
Conflicts []string `yaml:"conflicts,omitempty"`
|
||||||
|
ConditionalConflicts map[string][]string `yaml:"conditional_conflicts,omitempty"`
|
||||||
|
Optional []string `yaml:"optional,omitempty"`
|
||||||
|
ConditionalOptional map[string][]string `yaml:"conditional_optional,omitempty"`
|
||||||
|
Provides []string `yaml:"provides,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetPackageInfoRaw(filename string) (string, error) {
|
func GetPackageInfoRaw(filename string) (string, error) {
|
||||||
@ -275,59 +282,20 @@ func ReadPackageInfo(contents string, defaultValues bool) (*PackageInfo, error)
|
|||||||
License: "",
|
License: "",
|
||||||
Arch: "",
|
Arch: "",
|
||||||
Type: "",
|
Type: "",
|
||||||
Keep: nil,
|
Keep: make([]string, 0),
|
||||||
Depends: nil,
|
Depends: make([]string, 0),
|
||||||
MakeDepends: nil,
|
ConditionalDepends: make(map[string][]string),
|
||||||
Provides: nil,
|
MakeDepends: make([]string, 0),
|
||||||
}
|
ConditionalMakeDepends: make(map[string][]string),
|
||||||
lines := strings.Split(contents, "\n")
|
Conflicts: make([]string, 0),
|
||||||
for num, line := range lines {
|
ConditionalConflicts: make(map[string][]string),
|
||||||
if len(strings.TrimSpace(line)) == 0 {
|
Optional: make([]string, 0),
|
||||||
continue
|
ConditionalOptional: make(map[string][]string),
|
||||||
}
|
Provides: make([]string, 0),
|
||||||
if line[0] == '#' {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
split := strings.SplitN(line, ":", 2)
|
|
||||||
if len(split) != 2 {
|
|
||||||
return nil, errors.New("invalid pkg.info format at line " + strconv.Itoa(num))
|
|
||||||
}
|
|
||||||
split[0] = strings.Trim(split[0], " ")
|
|
||||||
split[1] = strings.Trim(split[1], " ")
|
|
||||||
switch split[0] {
|
|
||||||
case "name":
|
|
||||||
if strings.Contains(split[1], " ") {
|
|
||||||
return nil, errors.New("the " + split[0] + " field cannot contain spaces")
|
|
||||||
}
|
|
||||||
pkgInfo.Name = split[1]
|
|
||||||
case "description":
|
|
||||||
pkgInfo.Description = split[1]
|
|
||||||
case "version":
|
|
||||||
if strings.Contains(split[1], " ") {
|
|
||||||
return nil, errors.New("the " + split[0] + " field cannot contain spaces")
|
|
||||||
}
|
|
||||||
pkgInfo.Version = split[1]
|
|
||||||
case "url":
|
|
||||||
pkgInfo.Url = split[1]
|
|
||||||
case "license":
|
|
||||||
pkgInfo.License = split[1]
|
|
||||||
case "architecture":
|
|
||||||
pkgInfo.Arch = split[1]
|
|
||||||
case "type":
|
|
||||||
pkgInfo.Type = split[1]
|
|
||||||
case "keep":
|
|
||||||
pkgInfo.Keep = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
|
|
||||||
pkgInfo.Keep = stringSliceRemoveEmpty(pkgInfo.Keep)
|
|
||||||
case "depends":
|
|
||||||
pkgInfo.Depends = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
|
|
||||||
pkgInfo.Depends = stringSliceRemoveEmpty(pkgInfo.Depends)
|
|
||||||
case "make_depends":
|
|
||||||
pkgInfo.MakeDepends = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
|
|
||||||
pkgInfo.MakeDepends = stringSliceRemoveEmpty(pkgInfo.MakeDepends)
|
|
||||||
case "provides":
|
|
||||||
pkgInfo.Provides = strings.Split(strings.Replace(split[1], " ", "", -1), ",")
|
|
||||||
pkgInfo.Provides = stringSliceRemoveEmpty(pkgInfo.Provides)
|
|
||||||
}
|
}
|
||||||
|
err := yaml.Unmarshal([]byte(contents), &pkgInfo)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
if !defaultValues {
|
if !defaultValues {
|
||||||
if pkgInfo.Name == "" {
|
if pkgInfo.Name == "" {
|
||||||
@ -345,35 +313,15 @@ func ReadPackageInfo(contents string, defaultValues bool) (*PackageInfo, error)
|
|||||||
return &pkgInfo, nil
|
return &pkgInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateInfoFile(pkgInfo PackageInfo, keepSourceFields bool) string {
|
func CreateInfoFile(pkgInfo PackageInfo) string {
|
||||||
ret := ""
|
bytes, err := yaml.Marshal(&pkgInfo)
|
||||||
ret = ret + "name: " + pkgInfo.Name + "\n"
|
if err != nil {
|
||||||
ret = ret + "description: " + pkgInfo.Description + "\n"
|
return ""
|
||||||
ret = ret + "version: " + pkgInfo.Version + "\n"
|
|
||||||
if pkgInfo.Url != "" {
|
|
||||||
ret = ret + "url: " + pkgInfo.Url + "\n"
|
|
||||||
}
|
}
|
||||||
if pkgInfo.License != "" {
|
return string(bytes)
|
||||||
ret = ret + "license: " + pkgInfo.License + "\n"
|
|
||||||
}
|
|
||||||
ret = ret + "architecture: " + pkgInfo.Arch + "\n"
|
|
||||||
ret = ret + "type: " + pkgInfo.Type + "\n"
|
|
||||||
if len(pkgInfo.Keep) > 0 {
|
|
||||||
ret = ret + "keep (" + strconv.Itoa(len(pkgInfo.Keep)) + "): " + strings.Join(pkgInfo.Keep, ",") + "\n"
|
|
||||||
}
|
|
||||||
if len(pkgInfo.Depends) > 0 {
|
|
||||||
ret = ret + "depends (" + strconv.Itoa(len(pkgInfo.Depends)) + "): " + strings.Join(pkgInfo.Depends, ",") + "\n"
|
|
||||||
}
|
|
||||||
if len(pkgInfo.MakeDepends) > 0 && keepSourceFields {
|
|
||||||
ret = ret + "make_depends (" + strconv.Itoa(len(pkgInfo.MakeDepends)) + "): " + strings.Join(pkgInfo.MakeDepends, ",") + "\n"
|
|
||||||
}
|
|
||||||
if len(pkgInfo.Provides) > 0 {
|
|
||||||
ret = ret + "provides (" + strconv.Itoa(len(pkgInfo.Provides)) + "): " + strings.Join(pkgInfo.Provides, ",") + "\n"
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []string) {
|
func extractPackage(pkgInfo *PackageInfo, verbose bool, filename, rootDir string) (error, []string) {
|
||||||
var files []string
|
var files []string
|
||||||
if !IsPackageInstalled(pkgInfo.Name, rootDir) {
|
if !IsPackageInstalled(pkgInfo.Name, rootDir) {
|
||||||
err := ExecutePackageScripts(filename, rootDir, Install, false)
|
err := ExecutePackageScripts(filename, rootDir, Install, false)
|
||||||
@ -415,12 +363,16 @@ func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []st
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Directory: " + extractFilename)
|
fmt.Println("Creating Directory: " + extractFilename)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
case tar.TypeReg:
|
case tar.TypeReg:
|
||||||
if _, err := os.Stat(extractFilename); err == nil {
|
if _, err := os.Stat(extractFilename); err == nil {
|
||||||
if slices.Contains(pkgInfo.Keep, trimmedName) {
|
if slices.Contains(pkgInfo.Keep, trimmedName) {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
|
fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
|
||||||
|
}
|
||||||
files = append(files, trimmedName)
|
files = append(files, trimmedName)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@ -430,7 +382,9 @@ func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []st
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
outFile, err := os.Create(extractFilename)
|
outFile, err := os.Create(extractFilename)
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating File: " + extractFilename)
|
fmt.Println("Creating File: " + extractFilename)
|
||||||
|
}
|
||||||
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
@ -446,7 +400,9 @@ func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []st
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
case tar.TypeSymlink:
|
case tar.TypeSymlink:
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Symlink: " + extractFilename + " -> " + header.Linkname)
|
fmt.Println("Creating Symlink: " + extractFilename + " -> " + header.Linkname)
|
||||||
|
}
|
||||||
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
||||||
err := os.Remove(extractFilename)
|
err := os.Remove(extractFilename)
|
||||||
if err != nil && !os.IsNotExist(err) {
|
if err != nil && !os.IsNotExist(err) {
|
||||||
@ -457,7 +413,9 @@ func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []st
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
case tar.TypeLink:
|
case tar.TypeLink:
|
||||||
|
if verbose {
|
||||||
fmt.Println("Detected Hard Link: " + extractFilename + " -> " + path.Join(rootDir, strings.TrimPrefix(header.Linkname, "files/")))
|
fmt.Println("Detected Hard Link: " + extractFilename + " -> " + path.Join(rootDir, strings.TrimPrefix(header.Linkname, "files/")))
|
||||||
|
}
|
||||||
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
files = append(files, strings.TrimPrefix(header.Name, "files/"))
|
||||||
seenHardlinks[extractFilename] = path.Join(strings.TrimPrefix(header.Linkname, "files/"))
|
seenHardlinks[extractFilename] = path.Join(strings.TrimPrefix(header.Linkname, "files/"))
|
||||||
err := os.Remove(extractFilename)
|
err := os.Remove(extractFilename)
|
||||||
@ -470,7 +428,9 @@ func extractPackage(pkgInfo *PackageInfo, filename, rootDir string) (error, []st
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
for extractFilename, destination := range seenHardlinks {
|
for extractFilename, destination := range seenHardlinks {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Hard Link: " + extractFilename + " -> " + path.Join(rootDir, destination))
|
fmt.Println("Creating Hard Link: " + extractFilename + " -> " + path.Join(rootDir, destination))
|
||||||
|
}
|
||||||
err := os.Link(path.Join(rootDir, destination), extractFilename)
|
err := os.Link(path.Join(rootDir, destination), extractFilename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
@ -496,7 +456,7 @@ func isSplitPackage(filename string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, binaryPkgFromSrc, skipCheck, keepTempDir bool) (error, []string) {
|
func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, verbose, binaryPkgFromSrc, skipCheck, keepTempDir bool) (error, []string) {
|
||||||
var files []string
|
var files []string
|
||||||
if !IsPackageInstalled(pkgInfo.Name, rootDir) {
|
if !IsPackageInstalled(pkgInfo.Name, rootDir) {
|
||||||
err := ExecutePackageScripts(filename, rootDir, Install, false)
|
err := ExecutePackageScripts(filename, rootDir, Install, false)
|
||||||
@ -525,7 +485,9 @@ func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, binaryPkgFro
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating temp directory at: " + temp)
|
fmt.Println("Creating temp directory at: " + temp)
|
||||||
|
}
|
||||||
err = os.Mkdir(temp, 0755)
|
err = os.Mkdir(temp, 0755)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
@ -552,7 +514,9 @@ func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, binaryPkgFro
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Directory: " + extractFilename)
|
fmt.Println("Creating Directory: " + extractFilename)
|
||||||
|
}
|
||||||
err = os.Chown(extractFilename, 65534, 65534)
|
err = os.Chown(extractFilename, 65534, 65534)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
@ -564,7 +528,9 @@ func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, binaryPkgFro
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
outFile, err := os.Create(extractFilename)
|
outFile, err := os.Create(extractFilename)
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating File: " + extractFilename)
|
fmt.Println("Creating File: " + extractFilename)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
@ -583,9 +549,13 @@ func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, binaryPkgFro
|
|||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
case tar.TypeSymlink:
|
case tar.TypeSymlink:
|
||||||
|
if verbose {
|
||||||
fmt.Println("Skipping symlink (Bundling symlinks in source packages is not supported)")
|
fmt.Println("Skipping symlink (Bundling symlinks in source packages is not supported)")
|
||||||
|
}
|
||||||
case tar.TypeLink:
|
case tar.TypeLink:
|
||||||
|
if verbose {
|
||||||
fmt.Println("Skipping hard link (Bundling hard links in source packages is not supported)")
|
fmt.Println("Skipping hard link (Bundling hard links in source packages is not supported)")
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
return errors.New("ExtractTarGz: unknown type: " + strconv.Itoa(int(header.Typeflag)) + " in " + extractFilename), nil
|
return errors.New("ExtractTarGz: unknown type: " + strconv.Itoa(int(header.Typeflag)) + " in " + extractFilename), nil
|
||||||
}
|
}
|
||||||
@ -779,12 +749,16 @@ fi
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Directory: " + extractFilename)
|
fmt.Println("Creating Directory: " + extractFilename)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else if d.Type().IsRegular() {
|
} else if d.Type().IsRegular() {
|
||||||
if _, err := os.Stat(extractFilename); err == nil {
|
if _, err := os.Stat(extractFilename); err == nil {
|
||||||
if slices.Contains(pkgInfo.Keep, relFilename) {
|
if slices.Contains(pkgInfo.Keep, relFilename) {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
|
fmt.Println("Skipping File: " + extractFilename + "(File is configured to be kept during installs/updates)")
|
||||||
|
}
|
||||||
files = append(files, relFilename)
|
files = append(files, relFilename)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -794,7 +768,9 @@ fi
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
outFile, err := os.Create(extractFilename)
|
outFile, err := os.Create(extractFilename)
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating File: " + extractFilename)
|
fmt.Println("Creating File: " + extractFilename)
|
||||||
|
}
|
||||||
files = append(files, relFilename)
|
files = append(files, relFilename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -830,7 +806,9 @@ fi
|
|||||||
if err != nil && !os.IsNotExist(err) {
|
if err != nil && !os.IsNotExist(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if verbose {
|
||||||
fmt.Println("Creating Symlink: "+extractFilename, " -> "+link)
|
fmt.Println("Creating Symlink: "+extractFilename, " -> "+link)
|
||||||
|
}
|
||||||
files = append(files, relFilename)
|
files = append(files, relFilename)
|
||||||
err = os.Symlink(link, extractFilename)
|
err = os.Symlink(link, extractFilename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -849,7 +827,7 @@ fi
|
|||||||
compiledInfo = *pkgInfo
|
compiledInfo = *pkgInfo
|
||||||
compiledInfo.Type = "binary"
|
compiledInfo.Type = "binary"
|
||||||
compiledInfo.Arch = GetArch()
|
compiledInfo.Arch = GetArch()
|
||||||
err = os.WriteFile(path.Join(temp, "pkg.info"), []byte(CreateInfoFile(compiledInfo, false)), 0644)
|
err = os.WriteFile(path.Join(temp, "pkg.info"), []byte(CreateInfoFile(compiledInfo)), 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, nil
|
||||||
}
|
}
|
||||||
@ -909,7 +887,7 @@ fi
|
|||||||
return nil, files
|
return nil, files
|
||||||
}
|
}
|
||||||
|
|
||||||
func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck, keepTempDir bool) error {
|
func InstallPackage(filename, rootDir string, verbose, force, binaryPkgFromSrc, skipCheck, keepTempDir bool) error {
|
||||||
if _, err := os.Stat(filename); os.IsNotExist(err) {
|
if _, err := os.Stat(filename); os.IsNotExist(err) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -927,12 +905,12 @@ func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck
|
|||||||
if pkgInfo.Arch != "any" && pkgInfo.Arch != GetArch() {
|
if pkgInfo.Arch != "any" && pkgInfo.Arch != GetArch() {
|
||||||
return errors.New("cannot install a package with a different architecture")
|
return errors.New("cannot install a package with a different architecture")
|
||||||
}
|
}
|
||||||
if unresolved := CheckDependencies(pkgInfo, rootDir); len(unresolved) != 0 {
|
if unresolved := CheckDependencies(pkgInfo, true, true, rootDir); len(unresolved) != 0 {
|
||||||
return errors.New("Could not resolve all dependencies. Missing " + strings.Join(unresolved, ", "))
|
return errors.New("Could not resolve all dependencies. Missing " + strings.Join(unresolved, ", "))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if pkgInfo.Type == "binary" {
|
if pkgInfo.Type == "binary" {
|
||||||
err, i := extractPackage(pkgInfo, filename, rootDir)
|
err, i := extractPackage(pkgInfo, verbose, filename, rootDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -941,7 +919,7 @@ func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck
|
|||||||
if isSplitPackage(filename) {
|
if isSplitPackage(filename) {
|
||||||
return errors.New("BPM is unable to install split source packages")
|
return errors.New("BPM is unable to install split source packages")
|
||||||
}
|
}
|
||||||
err, i := compilePackage(pkgInfo, filename, rootDir, binaryPkgFromSrc, skipCheck, keepTempDir)
|
err, i := compilePackage(pkgInfo, filename, rootDir, verbose, binaryPkgFromSrc, skipCheck, keepTempDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -1023,7 +1001,7 @@ func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(filesDiff) != 0 {
|
if len(filesDiff) != 0 {
|
||||||
fmt.Println("Removing obsolete files")
|
fmt.Println("Removing obsolete files...")
|
||||||
var symlinks []string
|
var symlinks []string
|
||||||
for _, f := range filesDiff {
|
for _, f := range filesDiff {
|
||||||
f = path.Join(rootDir, f)
|
f = path.Join(rootDir, f)
|
||||||
@ -1049,14 +1027,18 @@ func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(dir) == 0 {
|
if len(dir) == 0 {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + f)
|
fmt.Println("Removing: " + f)
|
||||||
|
}
|
||||||
err := os.Remove(f)
|
err := os.Remove(f)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + f)
|
fmt.Println("Removing: " + f)
|
||||||
|
}
|
||||||
err := os.Remove(f)
|
err := os.Remove(f)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -1082,7 +1064,9 @@ func InstallPackage(filename, rootDir string, force, binaryPkgFromSrc, skipCheck
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
removals++
|
removals++
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + f)
|
fmt.Println("Removing: " + f)
|
||||||
|
}
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -1144,24 +1128,67 @@ func GetSourceScript(filename string) (string, error) {
|
|||||||
return "", errors.New("package does not contain a source.sh file")
|
return "", errors.New("package does not contain a source.sh file")
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckDependencies(pkgInfo *PackageInfo, rootDir string) []string {
|
func CheckDependencies(pkgInfo *PackageInfo, checkMake, checkConditional bool, rootDir string) []string {
|
||||||
var unresolved []string
|
var ret []string
|
||||||
for _, dependency := range pkgInfo.Depends {
|
for _, dependency := range pkgInfo.Depends {
|
||||||
if !IsPackageInstalled(dependency, rootDir) {
|
if !IsPackageInstalled(dependency, rootDir) {
|
||||||
unresolved = append(unresolved, dependency)
|
ret = append(ret, dependency)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return unresolved
|
if checkMake {
|
||||||
|
for _, dependency := range pkgInfo.MakeDepends {
|
||||||
|
if !IsPackageInstalled(dependency, rootDir) {
|
||||||
|
ret = append(ret, dependency)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if checkConditional {
|
||||||
|
for condition, dependencies := range pkgInfo.ConditionalDepends {
|
||||||
|
if !IsPackageInstalled(condition, rootDir) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, dependency := range dependencies {
|
||||||
|
if !IsPackageInstalled(dependency, rootDir) {
|
||||||
|
ret = append(ret, dependency)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if checkMake {
|
||||||
|
for condition, dependencies := range pkgInfo.ConditionalMakeDepends {
|
||||||
|
if !IsPackageInstalled(condition, rootDir) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, dependency := range dependencies {
|
||||||
|
if !IsPackageInstalled(dependency, rootDir) {
|
||||||
|
ret = append(ret, dependency)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckMakeDependencies(pkgInfo *PackageInfo, rootDir string) []string {
|
func CheckConflicts(pkgInfo *PackageInfo, checkConditional bool, rootDir string) []string {
|
||||||
var unresolved []string
|
var ret []string
|
||||||
for _, dependency := range pkgInfo.MakeDepends {
|
for _, conflict := range pkgInfo.Conflicts {
|
||||||
if !IsPackageInstalled(dependency, "/") {
|
if IsPackageInstalled(conflict, rootDir) {
|
||||||
unresolved = append(unresolved, dependency)
|
ret = append(ret, conflict)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return unresolved
|
if checkConditional {
|
||||||
|
for condition, conflicts := range pkgInfo.ConditionalConflicts {
|
||||||
|
if !IsPackageInstalled(condition, rootDir) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, conflict := range conflicts {
|
||||||
|
if IsPackageInstalled(conflict, rootDir) {
|
||||||
|
ret = append(ret, conflict)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsPackageInstalled(pkg, rootDir string) bool {
|
func IsPackageInstalled(pkg, rootDir string) bool {
|
||||||
@ -1236,7 +1263,7 @@ func GetPackageInfo(pkg, rootDir string, defaultValues bool) *PackageInfo {
|
|||||||
return info
|
return info
|
||||||
}
|
}
|
||||||
|
|
||||||
func RemovePackage(pkg, rootDir string) error {
|
func RemovePackage(pkg string, verbose bool, rootDir string) error {
|
||||||
installedDir := path.Join(rootDir, "var/lib/bpm/installed/")
|
installedDir := path.Join(rootDir, "var/lib/bpm/installed/")
|
||||||
pkgDir := path.Join(installedDir, pkg)
|
pkgDir := path.Join(installedDir, pkg)
|
||||||
pkgInfo := GetPackageInfo(pkg, rootDir, false)
|
pkgInfo := GetPackageInfo(pkg, rootDir, false)
|
||||||
@ -1271,14 +1298,18 @@ func RemovePackage(pkg, rootDir string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(dir) == 0 {
|
if len(dir) == 0 {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + file)
|
fmt.Println("Removing: " + file)
|
||||||
|
}
|
||||||
err := os.Remove(file)
|
err := os.Remove(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + file)
|
fmt.Println("Removing: " + file)
|
||||||
|
}
|
||||||
err := os.Remove(file)
|
err := os.Remove(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -1304,7 +1335,9 @@ func RemovePackage(pkg, rootDir string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
removals++
|
removals++
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + file)
|
fmt.Println("Removing: " + file)
|
||||||
|
}
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -1347,6 +1380,8 @@ func RemovePackage(pkg, rootDir string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if verbose {
|
||||||
fmt.Println("Removing: " + pkgDir)
|
fmt.Println("Removing: " + pkgDir)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
33
main.go
33
main.go
@ -17,13 +17,14 @@ import (
|
|||||||
/* A simple-to-use package manager */
|
/* A simple-to-use package manager */
|
||||||
/* ---------------------------------- */
|
/* ---------------------------------- */
|
||||||
|
|
||||||
var bpmVer = "0.3.2"
|
var bpmVer = "0.4"
|
||||||
|
|
||||||
var subcommand = "help"
|
var subcommand = "help"
|
||||||
var subcommandArgs []string
|
var subcommandArgs []string
|
||||||
|
|
||||||
// Flags
|
// Flags
|
||||||
var rootDir = "/"
|
var rootDir = "/"
|
||||||
|
var verbose = false
|
||||||
var yesAll = false
|
var yesAll = false
|
||||||
var buildSource = false
|
var buildSource = false
|
||||||
var skipCheck = false
|
var skipCheck = false
|
||||||
@ -86,7 +87,7 @@ func resolveCommand() {
|
|||||||
fmt.Printf("Package (%s) could not be found\n", pkg)
|
fmt.Printf("Package (%s) could not be found\n", pkg)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info, true))
|
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info))
|
||||||
if n == len(packages)-1 {
|
if n == len(packages)-1 {
|
||||||
fmt.Println("----------------")
|
fmt.Println("----------------")
|
||||||
}
|
}
|
||||||
@ -114,7 +115,7 @@ func resolveCommand() {
|
|||||||
fmt.Printf("Package (%s) could not be found\n", pkg)
|
fmt.Printf("Package (%s) could not be found\n", pkg)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info, true))
|
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*info))
|
||||||
if n == len(packages)-1 {
|
if n == len(packages)-1 {
|
||||||
fmt.Println("----------------")
|
fmt.Println("----------------")
|
||||||
}
|
}
|
||||||
@ -136,13 +137,13 @@ func resolveCommand() {
|
|||||||
log.Fatalf("Could not read package\nError: %s\n", err)
|
log.Fatalf("Could not read package\nError: %s\n", err)
|
||||||
}
|
}
|
||||||
if !yesAll {
|
if !yesAll {
|
||||||
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo, true))
|
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo))
|
||||||
fmt.Println("----------------")
|
fmt.Println("----------------")
|
||||||
}
|
}
|
||||||
verb := "install"
|
verb := "install"
|
||||||
if pkgInfo.Type == "source" {
|
if pkgInfo.Type == "source" {
|
||||||
if _, err := os.Stat("/bin/fakeroot"); os.IsNotExist(err) {
|
if _, err := os.Stat("/bin/fakeroot"); os.IsNotExist(err) {
|
||||||
fmt.Printf("Skipping... cannot %s package (%s) due to fakeroot not being installed")
|
fmt.Printf("Skipping... cannot %s package (%s) due to fakeroot not being installed", verb, pkgInfo.Name)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
verb = "build"
|
verb = "build"
|
||||||
@ -152,17 +153,15 @@ func resolveCommand() {
|
|||||||
fmt.Printf("skipping... cannot %s a package with a different architecture\n", verb)
|
fmt.Printf("skipping... cannot %s a package with a different architecture\n", verb)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if unresolved := bpm_utils.CheckDependencies(pkgInfo, rootDir); len(unresolved) != 0 {
|
if unresolved := bpm_utils.CheckDependencies(pkgInfo, true, true, rootDir); len(unresolved) != 0 {
|
||||||
fmt.Printf("skipping... cannot %s package (%s) due to missing dependencies: %s\n", verb, pkgInfo.Name, strings.Join(unresolved, ", "))
|
fmt.Printf("skipping... cannot %s package (%s) due to missing dependencies: %s\n", verb, pkgInfo.Name, strings.Join(unresolved, ", "))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if pkgInfo.Type == "source" {
|
if conflicts := bpm_utils.CheckConflicts(pkgInfo, true, rootDir); len(conflicts) != 0 {
|
||||||
if unresolved := bpm_utils.CheckMakeDependencies(pkgInfo, "/"); len(unresolved) != 0 {
|
fmt.Printf("skipping... cannot %s package (%s) due to conflicting packages: %s\n", verb, pkgInfo.Name, strings.Join(conflicts, ", "))
|
||||||
fmt.Printf("skipping... cannot %s package (%s) due to missing make dependencies: %s\n", verb, pkgInfo.Name, strings.Join(unresolved, ", "))
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if rootDir != "/" {
|
if rootDir != "/" {
|
||||||
fmt.Println("Warning: Operating in " + rootDir)
|
fmt.Println("Warning: Operating in " + rootDir)
|
||||||
}
|
}
|
||||||
@ -211,7 +210,7 @@ func resolveCommand() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = bpm_utils.InstallPackage(file, rootDir, forceInstall, buildSource, skipCheck, keepTempDir)
|
err = bpm_utils.InstallPackage(file, rootDir, verbose, forceInstall, buildSource, skipCheck, keepTempDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if pkgInfo.Type == "source" && keepTempDir {
|
if pkgInfo.Type == "source" && keepTempDir {
|
||||||
fmt.Println("BPM temp directory was created at /var/tmp/bpm_source-" + pkgInfo.Name)
|
fmt.Println("BPM temp directory was created at /var/tmp/bpm_source-" + pkgInfo.Name)
|
||||||
@ -239,7 +238,7 @@ func resolveCommand() {
|
|||||||
fmt.Printf("Package (%s) could not be found\n", pkg)
|
fmt.Printf("Package (%s) could not be found\n", pkg)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo, true))
|
fmt.Print("----------------\n" + bpm_utils.CreateInfoFile(*pkgInfo))
|
||||||
fmt.Println("----------------")
|
fmt.Println("----------------")
|
||||||
if rootDir != "/" {
|
if rootDir != "/" {
|
||||||
fmt.Println("Warning: Operating in " + rootDir)
|
fmt.Println("Warning: Operating in " + rootDir)
|
||||||
@ -253,7 +252,7 @@ func resolveCommand() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
err := bpm_utils.RemovePackage(pkg, rootDir)
|
err := bpm_utils.RemovePackage(pkg, verbose, rootDir)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Could not remove package\nError: %s\n", err)
|
log.Fatalf("Could not remove package\nError: %s\n", err)
|
||||||
@ -324,15 +323,17 @@ func printHelp() {
|
|||||||
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
||||||
fmt.Println(" -c lists the amount of installed packages")
|
fmt.Println(" -c lists the amount of installed packages")
|
||||||
fmt.Println(" -n lists only the names of installed packages")
|
fmt.Println(" -n lists only the names of installed packages")
|
||||||
fmt.Println("-> bpm install [-R, -y, -f, -o, -c, -b, -k] <files...> | installs the following files")
|
fmt.Println("-> bpm install [-R, -v, -y, -f, -o, -c, -b, -k] <files...> | installs the following files")
|
||||||
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
||||||
|
fmt.Println(" -v Show additional information about what BPM is doing")
|
||||||
fmt.Println(" -y skips the confirmation prompt")
|
fmt.Println(" -y skips the confirmation prompt")
|
||||||
fmt.Println(" -f skips dependency and architecture checking")
|
fmt.Println(" -f skips dependency and architecture checking")
|
||||||
fmt.Println(" -o=<path> set the binary package output directory (defaults to /var/lib/bpm/compiled)")
|
fmt.Println(" -o=<path> set the binary package output directory (defaults to /var/lib/bpm/compiled)")
|
||||||
fmt.Println(" -c=<path> set the compilation directory (defaults to /var/tmp)")
|
fmt.Println(" -c=<path> set the compilation directory (defaults to /var/tmp)")
|
||||||
fmt.Println(" -b creates a binary package from a source package after compilation and saves it in the binary package output directory")
|
fmt.Println(" -b creates a binary package from a source package after compilation and saves it in the binary package output directory")
|
||||||
fmt.Println(" -k keeps the compilation directory created by BPM after source package installation")
|
fmt.Println(" -k keeps the compilation directory created by BPM after source package installation")
|
||||||
fmt.Println("-> bpm remove [-R, -y] <packages...> | removes the following packages")
|
fmt.Println("-> bpm remove [-R, -v, -y] <packages...> | removes the following packages")
|
||||||
|
fmt.Println(" -v Show additional information about what BPM is doing")
|
||||||
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
fmt.Println(" -R=<path> lets you define the root path which will be used")
|
||||||
fmt.Println(" -y skips the confirmation prompt")
|
fmt.Println(" -y skips the confirmation prompt")
|
||||||
fmt.Println("-> bpm file [-R] <files...> | shows what packages the following packages are managed by")
|
fmt.Println("-> bpm file [-R] <files...> | shows what packages the following packages are managed by")
|
||||||
@ -354,6 +355,7 @@ func resolveFlags() {
|
|||||||
// Install flags
|
// Install flags
|
||||||
installFlagSet := flag.NewFlagSet("Install flags", flag.ExitOnError)
|
installFlagSet := flag.NewFlagSet("Install flags", flag.ExitOnError)
|
||||||
installFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root")
|
installFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root")
|
||||||
|
installFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing")
|
||||||
installFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts")
|
installFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts")
|
||||||
installFlagSet.StringVar(&bpm_utils.BPMConfig.BinaryOutputDir, "o", bpm_utils.BPMConfig.BinaryOutputDir, "Set the binary output directory")
|
installFlagSet.StringVar(&bpm_utils.BPMConfig.BinaryOutputDir, "o", bpm_utils.BPMConfig.BinaryOutputDir, "Set the binary output directory")
|
||||||
installFlagSet.StringVar(&bpm_utils.BPMConfig.CompilationDir, "c", bpm_utils.BPMConfig.CompilationDir, "Set the compilation directory")
|
installFlagSet.StringVar(&bpm_utils.BPMConfig.CompilationDir, "c", bpm_utils.BPMConfig.CompilationDir, "Set the compilation directory")
|
||||||
@ -365,6 +367,7 @@ func resolveFlags() {
|
|||||||
// Remove flags
|
// Remove flags
|
||||||
removeFlagSet := flag.NewFlagSet("Remove flags", flag.ExitOnError)
|
removeFlagSet := flag.NewFlagSet("Remove flags", flag.ExitOnError)
|
||||||
removeFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root")
|
removeFlagSet.StringVar(&rootDir, "R", "/", "Set the destination root")
|
||||||
|
removeFlagSet.BoolVar(&verbose, "v", false, "Show additional information about what BPM is doing")
|
||||||
removeFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts")
|
removeFlagSet.BoolVar(&yesAll, "y", false, "Skip confirmation prompts")
|
||||||
removeFlagSet.Usage = printHelp
|
removeFlagSet.Usage = printHelp
|
||||||
// File flags
|
// File flags
|
||||||
|
Loading…
x
Reference in New Issue
Block a user