forked from oreonproject/eternity
Made build process give output, made rudimentary RPM conversion, made symlinks work properly
This commit is contained in:
parent
714b62de11
commit
12bdda79a0
6 changed files with 319 additions and 28 deletions
BIN
cmd/cmd
BIN
cmd/cmd
Binary file not shown.
193
cmd/main.go
193
cmd/main.go
|
|
@ -1,13 +1,19 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"regexp"
|
||||
|
||||
"eternity/common"
|
||||
"eternity/lib"
|
||||
"fmt"
|
||||
|
||||
"math/big"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/Masterminds/semver"
|
||||
"github.com/sassoftware/go-rpmutils"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
@ -92,6 +98,187 @@ func main() {
|
|||
common.GenerateRepositoryHandleError(err, vagueError, logger)
|
||||
}
|
||||
}
|
||||
case "convert":
|
||||
if len(os.Args) < 4 {
|
||||
fmt.Println("Usage: eternity convert </path/to/rpm> [</path/to/output/epk>]")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
privateKey, err, vagueError := common.LoadPrivateKey(logger)
|
||||
if err != nil || vagueError != nil {
|
||||
common.LoadPrivateKeyHandleError(err, vagueError, logger)
|
||||
}
|
||||
|
||||
rpmFile, err := os.Open(os.Args[2])
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error opening RPM: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
rpm, err := rpmutils.ReadRpm(rpmFile)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error reading RPM: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
name, err := rpm.Header.GetString(rpmutils.NAME)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM name: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
description, err := rpm.Header.GetString(rpmutils.DESCRIPTION)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM description: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
longDescription := logger.LogFunc(lib.Log{
|
||||
Level: "INFO",
|
||||
Content: "Enter a long description for the package: ",
|
||||
Prompt: true,
|
||||
})
|
||||
|
||||
version, err := rpm.Header.GetString(rpmutils.VERSION)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM version: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
release, err := rpm.Header.GetString(rpmutils.RELEASE)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM release: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
semanticVersion, err := semver.NewVersion(version + "-" + release)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error parsing RPM version and release: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
author := logger.LogFunc(lib.Log{
|
||||
Level: "PROMPT",
|
||||
Content: "Enter your preferred author name. This must be the same as the author name used in " +
|
||||
"eternity.json and associated with your keypair, otherwise it will cause issues with EPK" +
|
||||
" verification and your repository will be rejected by Eon and cannot be trusted.",
|
||||
Prompt: true,
|
||||
})
|
||||
|
||||
license, err := rpm.Header.GetString(rpmutils.LICENSE)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM license: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
decompressedSize, err := rpm.Header.GetUint64s(rpmutils.SIZE)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM size: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
dependenciesRpm, err := rpm.Header.GetStrings(rpmutils.REQUIRENAME)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM dependencies: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
libRegex := regexp.MustCompile(`^([a-z]+)`)
|
||||
var dependencies []string
|
||||
|
||||
for _, dependency := range dependenciesRpm {
|
||||
dependencyMatch := libRegex.FindStringSubmatch(dependency)
|
||||
if len(dependencyMatch) > 1 {
|
||||
match := dependencyMatch[1]
|
||||
if match != "rpmlib" && match != "rtld" {
|
||||
var exists bool
|
||||
for _, dep := range dependencies {
|
||||
if dep == match {
|
||||
exists = true
|
||||
}
|
||||
}
|
||||
if !exists {
|
||||
dependencies = append(dependencies, match)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println(dependencies)
|
||||
|
||||
architecture, err := rpm.Header.GetString(rpmutils.ARCH)
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error getting RPM architecture: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
metadata := lib.Metadata{
|
||||
Name: name,
|
||||
Description: description,
|
||||
LongDescription: longDescription,
|
||||
Version: *semanticVersion,
|
||||
Author: author,
|
||||
License: license,
|
||||
Architecture: architecture,
|
||||
Dependencies: dependencies,
|
||||
DecompressedSize: *big.NewInt(int64(decompressedSize[0])),
|
||||
SpecialFiles: lib.SpecialFiles{},
|
||||
}
|
||||
|
||||
// Output the RPM data to a temporary directory
|
||||
tempDir, err := os.MkdirTemp("", "eternity-convert-")
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error creating temporary directory: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
err = rpm.ExpandPayload(filepath.Join(tempDir, "payload"))
|
||||
if err != nil {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "FATAL",
|
||||
Content: "Error expanding RPM payload: " + err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
// Package the EPK
|
||||
err, vagueError = lib.PackageEPK(metadata, lib.Build{
|
||||
TargetRoot: "payload",
|
||||
HooksFolder: lib.PotentiallyNullString{
|
||||
Null: true,
|
||||
},
|
||||
}, tempDir, os.Args[3], privateKey, logger)
|
||||
if err != nil || vagueError != nil {
|
||||
common.PackageEPKHandleError(err, vagueError, logger)
|
||||
} else {
|
||||
logger.LogFunc(lib.Log{
|
||||
Level: "INFO",
|
||||
Content: "Successfully converted RPM to EPK at " + os.Args[3],
|
||||
})
|
||||
}
|
||||
case "help":
|
||||
if len(os.Args) > 2 {
|
||||
switch os.Args[2] {
|
||||
|
|
@ -99,7 +286,7 @@ func main() {
|
|||
fmt.Println("Usage: eternity build [-d/--disk]")
|
||||
fmt.Println(" -d, --disk Build EPK on disk instead of in memory. This is useful for large EPKs.")
|
||||
case "convert":
|
||||
fmt.Println("Usage: eternity convert </path/to/rpm> [</path/to/output/epk>]")
|
||||
fmt.Println("Usage: eternity convert </path/to/rpm> </path/to/output/epk>")
|
||||
case "repo":
|
||||
fmt.Println("Usage: eternity repo <build/generate> <directory>")
|
||||
fmt.Println(" build Build a repository from a directory containing EPK project directories.")
|
||||
|
|
|
|||
|
|
@ -2,15 +2,17 @@ package common
|
|||
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"eternity/lib"
|
||||
|
||||
"crypto/ed25519"
|
||||
"crypto/x509"
|
||||
"encoding/pem"
|
||||
"errors"
|
||||
"eternity/lib"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/fatih/color"
|
||||
)
|
||||
|
|
@ -48,6 +50,8 @@ var DefaultLogger = lib.Logger{
|
|||
return ""
|
||||
},
|
||||
PromptSupported: true,
|
||||
StdoutSupported: true,
|
||||
Stdout: os.Stdout,
|
||||
}
|
||||
|
||||
// EternityJsonHandleError handles errors related to the parsing of eternity.json
|
||||
|
|
|
|||
9
go.mod
9
go.mod
|
|
@ -7,10 +7,17 @@ require (
|
|||
github.com/cespare/xxhash/v2 v2.3.0
|
||||
github.com/fatih/color v1.17.0
|
||||
github.com/klauspost/compress v1.17.9
|
||||
github.com/sassoftware/go-rpmutils v0.4.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/DataDog/zstd v1.5.6 // indirect
|
||||
github.com/ProtonMail/go-crypto v1.0.0 // indirect
|
||||
github.com/cloudflare/circl v1.4.0 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
golang.org/x/sys v0.24.0 // indirect
|
||||
github.com/ulikunitz/xz v0.5.12 // indirect
|
||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
|
||||
golang.org/x/crypto v0.27.0 // indirect
|
||||
golang.org/x/sys v0.25.0 // indirect
|
||||
)
|
||||
|
|
|
|||
76
go.sum
76
go.sum
|
|
@ -1,7 +1,23 @@
|
|||
github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
|
||||
github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
|
||||
github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY=
|
||||
github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
|
||||
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
|
||||
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
|
||||
github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
|
||||
github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
|
||||
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
|
||||
github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
|
||||
github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
|
||||
github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
|
||||
github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
|
||||
github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY=
|
||||
github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
|
||||
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
|
||||
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||
|
|
@ -11,7 +27,67 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
|
|||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=
|
||||
github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
|
||||
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
|
||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
|
||||
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
|
||||
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
|
||||
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
|
|
|||
33
lib/main.go
33
lib/main.go
|
|
@ -1,19 +1,20 @@
|
|||
package lib
|
||||
|
||||
import (
|
||||
"archive/tar"
|
||||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"archive/tar"
|
||||
"crypto/ed25519"
|
||||
"encoding/binary"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"math/big"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Masterminds/semver"
|
||||
"github.com/cespare/xxhash/v2"
|
||||
|
|
@ -74,6 +75,8 @@ type Log struct {
|
|||
type Logger struct {
|
||||
LogFunc func(Log) string
|
||||
PromptSupported bool
|
||||
StdoutSupported bool
|
||||
Stdout io.Writer
|
||||
}
|
||||
|
||||
var ErrEternityJsonOpenError = errors.New("error opening eternity.json")
|
||||
|
|
@ -371,7 +374,11 @@ func BuildEPK(projectDir string, inMemory bool, buildConfig Build, logger *Logge
|
|||
)
|
||||
}
|
||||
|
||||
err = exec.Command("bwrap", arguments...).Run()
|
||||
cmd := exec.Command("bwrap", arguments...)
|
||||
if logger.StdoutSupported {
|
||||
cmd.Stdout = logger.Stdout
|
||||
}
|
||||
err = cmd.Run()
|
||||
if err != nil {
|
||||
return *big.NewInt(0), tempDir, err, ErrBuildEPKExecutingBuildShError
|
||||
}
|
||||
|
|
@ -416,7 +423,7 @@ func CreateTar(targetDir string, output io.Writer) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if !info.Mode().IsRegular() {
|
||||
if !info.Mode().IsRegular() && info.Mode()&os.ModeSymlink == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -427,11 +434,20 @@ func CreateTar(targetDir string, output io.Writer) error {
|
|||
|
||||
header.Name = strings.TrimPrefix(strings.Replace(path, targetDir, "", -1), string(filepath.Separator))
|
||||
|
||||
if info.Mode()&os.ModeSymlink != 0 {
|
||||
linkTarget, err := os.Readlink(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
header.Linkname = linkTarget
|
||||
}
|
||||
|
||||
err = tarWriter.WriteHeader(header)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if info.Mode().IsRegular() {
|
||||
file, err := os.Open(path)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -446,6 +462,7 @@ func CreateTar(targetDir string, output io.Writer) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in a new issue