Skip to content

Commit

Permalink
Merge pull request #207 from paketo-buildpacks/libpak-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dmikusa authored Oct 2, 2023
2 parents eedddf3 + 5a25af8 commit f6ba3cb
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tomee/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ func (b Base) ContributeAccessLogging(layer libcnb.Layer) error {

b.Logger.Bodyf("Copying to %s/lib", layer.Path)

file := filepath.Join(layer.Path, "lib", filepath.Base(artifact.Name()))
file := filepath.Join(layer.Path, "lib", filepath.Base(b.AccessLoggingDependency.URI))
if err := sherpa.CopyFile(artifact, file); err != nil {
return fmt.Errorf("unable to copy %s to %s\n%w", artifact.Name(), file, err)
return fmt.Errorf("unable to copy %s to %s\n%w", filepath.Base(b.AccessLoggingDependency.URI), file, err)
}

return nil
Expand Down Expand Up @@ -333,9 +333,9 @@ func (b Base) ContributeLifecycle(layer libcnb.Layer) error {

b.Logger.Bodyf("Copying to %s/lib", layer.Path)

file := filepath.Join(layer.Path, "lib", filepath.Base(artifact.Name()))
file := filepath.Join(layer.Path, "lib", filepath.Base(b.LifecycleDependency.URI))
if err := sherpa.CopyFile(artifact, file); err != nil {
return fmt.Errorf("unable to copy %s to %s\n%w", artifact.Name(), file, err)
return fmt.Errorf("unable to copy %s to %s\n%w", filepath.Base(b.LifecycleDependency.URI), file, err)
}

return nil
Expand All @@ -352,9 +352,9 @@ func (b Base) ContributeLogging(layer libcnb.Layer) error {

b.Logger.Bodyf("Copying to %s/bin", layer.Path)

file := filepath.Join(layer.Path, "bin", filepath.Base(artifact.Name()))
file := filepath.Join(layer.Path, "bin", filepath.Base(b.LoggingDependency.URI))
if err := sherpa.CopyFile(artifact, file); err != nil {
return fmt.Errorf("unable to copy %s to %s\n%w", artifact.Name(), file, err)
return fmt.Errorf("unable to copy %s to %s\n%w", filepath.Base(b.LoggingDependency.URI), file, err)
}

b.Logger.Bodyf("Writing %s/bin/setenv.sh", layer.Path)
Expand Down

0 comments on commit f6ba3cb

Please sign in to comment.