go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2026-06-19 23:24:39 +02:00
Code Issues Releases Activity

fix: avoid copying the completer multiple times (#1680)

Browse Source 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
This commit is contained in:
Carlos Alexandro Becker
2020-07-20 10:36:09 -03:00
committed by GitHub
parent 9c9f1c5815
commit 10a237364b
1 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/pipe/snapcraft/snapcraft.go
+37 -41
View File
@@ -239,49 +239,45 @@ func create(ctx *context.Context, snap config.Snapcraft, arch string, binaries [
if err := os.Chmod(destBinaryPath, 0555); err != nil {
return errors.Wrap(err, "failed to change binary permissions")
}
}
// setup the apps: directive for each binary
for name, config := range snap.Apps {
log.WithField("path", binary.Path).
WithField("name", name).
Debug("passed binary to snapcraft")
command := name
if config.Command != "" {
command = config.Command
}
// TODO: test that the correct binary is used in Command
// See https://github.com/goreleaser/goreleaser/pull/1449
appMetadata := AppMetadata{
Command: strings.TrimSpace(strings.Join([]string{
command,
config.Args,
}, " ")),
Plugs: config.Plugs,
Daemon: config.Daemon,
}
if config.Completer != "" {
destCompleterPath := filepath.Join(primeDir, config.Completer)
if err := os.MkdirAll(filepath.Dir(destCompleterPath), 0755); err != nil {
return errors.Wrapf(err, "failed to create folder")
}
log.WithField("src", config.Completer).
WithField("dst", destCompleterPath).
Debug("linking")
if err := os.Link(config.Completer, destCompleterPath); err != nil && !os.IsExist(err) {
return errors.Wrap(err, "failed to link completer")
}
if err := os.Chmod(destCompleterPath, 0644); err != nil {
return errors.Wrap(err, "failed to change completer permissions")
}
appMetadata.Completer = config.Completer
}
metadata.Apps[name] = appMetadata
metadata.Plugs = snap.Plugs
// setup the apps: directive for each binary
for name, config := range snap.Apps {
command := name
if config.Command != "" {
command = config.Command
}
// TODO: test that the correct binary is used in Command
// See https://github.com/goreleaser/goreleaser/pull/1449
appMetadata := AppMetadata{
Command: strings.TrimSpace(strings.Join([]string{
command,
config.Args,
}, " ")),
Plugs: config.Plugs,
Daemon: config.Daemon,
}
if config.Completer != "" {
destCompleterPath := filepath.Join(primeDir, config.Completer)
if err := os.MkdirAll(filepath.Dir(destCompleterPath), 0755); err != nil {
return errors.Wrapf(err, "failed to create folder")
}
log.WithField("src", config.Completer).
WithField("dst", destCompleterPath).
Debug("linking")
if err := os.Link(config.Completer, destCompleterPath); err != nil {
return errors.Wrap(err, "failed to link completer")
}
if err := os.Chmod(destCompleterPath, 0644); err != nil {
return errors.Wrap(err, "failed to change completer permissions")
}
appMetadata.Completer = config.Completer
}
metadata.Apps[name] = appMetadata
metadata.Plugs = snap.Plugs
}
out, err := yaml.Marshal(metadata)