Skip to content

Commit

Permalink
Move init.sh and check.sh out of the root resource directory (#1441)
Browse files Browse the repository at this point in the history
Moved the init and check scripts to a resource subdirectory less likely to collide with other Gradle plugins.
  • Loading branch information
sfackler authored Feb 22, 2023
1 parent 1f327a1 commit b0324b7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-1441.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: improvement
improvement:
description: Moved the init and check scripts to a resource subdirectory less likely
to collide with other Gradle plugins.
links:
- https://github.com/palantir/sls-packaging/pull/1441
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface Params {
static void action(Params params) {
if (!params.getCheckArgs().get().isEmpty()) {
EmitFiles.replaceVars(
JavaServiceDistributionPlugin.class.getResourceAsStream("/check.sh"),
JavaServiceDistributionPlugin.class.getResourceAsStream("/sls-packaging/check.sh"),
params.getOutputFile().get().getAsFile().toPath(),
ImmutableMap.of(
"@serviceName@", params.getServiceName().get(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ interface Params {

static void action(Params params) {
EmitFiles.replaceVars(
JavaServiceDistributionPlugin.class.getResourceAsStream("/init.sh"),
JavaServiceDistributionPlugin.class.getResourceAsStream("/sls-packaging/init.sh"),
params.getOutputFile().get().getAsFile().toPath(),
ImmutableMap.of("@serviceName@", params.getServiceName().get()))
.toFile()
Expand Down

0 comments on commit b0324b7

Please sign in to comment.