From 1a346a6d9004d9eae2765fca48c29983b1db3937 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 9 May 2024 16:08:47 -0400 Subject: [PATCH] Fix command split --- .../src/main/java/releaser/internal/git/GitRepo.java | 2 +- .../internal/project/ProjectCommandExecutor.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java index 44c52580..12b24a49 100644 --- a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java +++ b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java @@ -186,7 +186,7 @@ class GitRepo { void checkoutTag(String tagName) { try (Git git = this.gitFactory.open(file(this.basedir))) { - Optional tagId = findTagIdByName(tagName, true); + Optional tagId = findTagIdByName(tagName, false); if (tagId.isPresent()) { git.checkout().setName(tagId.get().getName()).call(); } diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java index 456f7be6..8a89931d 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -182,6 +182,13 @@ public class ProjectCommandExecutor { public void publishAntoraDocs(File antoraDocsProject, File project, ReleaserProperties properties) { String command = new CommandPicker(properties).publishAntoraDocsCommand(project, properties); log.info("Executing command for publishing Antora docs " + command + " / " + properties); + String[] commands = command.split(" "); + //TODO fix this hack + for (int i = 0; i < commands.length; i++) { + if (commands[i].contains("{{cat-key}}")) { + commands[i] = commands[i].replace("{{cat-key}}", "\"$(cat $DOCS_SERVER_SSH_KEY)\""); + } + } runCommand(properties, antoraDocsProject.getAbsolutePath(), command.split(" ")); } @@ -336,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return bashCommandWithSystemProps("./rsync-antora-reference/src/action.sh" - + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs.spring.io\" --docs-ssh-key \"$(cat $DOCS_SERVER_SSH_KEY)\" --docs-ssh-host-key \"#\" --site-path \"" + + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs.spring.io\" --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run {{systemProps}}"); }