From ecd20fa3728eb8d8ec03c309f73d486cc0a3f600 Mon Sep 17 00:00:00 2001 From: Phil Burton Date: Sun, 8 Nov 2020 17:10:04 +0000 Subject: Msgrelay move fix --- .../java/uk/co/blatech/blaears/controllers/BlauploadController.java | 2 +- src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java | 2 +- src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java | 2 +- src/main/java/uk/co/blatech/blaears/controllers/MsgRelayController.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/co/blatech/blaears/controllers/BlauploadController.java b/src/main/java/uk/co/blatech/blaears/controllers/BlauploadController.java index 4d11d79..9a5e71f 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/BlauploadController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/BlauploadController.java @@ -26,7 +26,7 @@ public class BlauploadController { model.addAttribute("result", "failed"); return "blaupload"; } - String command = "echo " + channel + " New file uploaded: " + url + "| bash /home/smsd/msgrelay.bash"; + String command = "echo " + channel + " New file uploaded: " + url + "| bash /home/smsd/core/msgrelay.bash"; log.info("Running command: [" + command + "]"); try { Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command}); diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java index 7c6fecb..66baffc 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java @@ -45,7 +45,7 @@ public class GitMergeController { return "gitlab"; } - String command = "echo theblueroom " + user + actionTxt + source + "] to [" + target + "] on [" + repo + "]: [" + title + "] "+ url + " | bash /home/smsd/msgrelay.bash "; + String command = "echo theblueroom " + user + actionTxt + source + "] to [" + target + "] on [" + repo + "]: [" + title + "] "+ url + " | bash /home/smsd/core/msgrelay.bash "; log.info("Running command: " + command); //DANGER Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command}); diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java index e0f684b..976d6c3 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java @@ -39,7 +39,7 @@ public class GitPushController { log.info("Received commits: " + commitMsg); //DANGER - String command = "echo theblueroom " + pushMsg.getUserName() + " pushed to [" + pushMsg.getRepository().getName() + "]: "+ commitMsg + " | bash /home/smsd/msgrelay.bash"; + String command = "echo theblueroom " + pushMsg.getUserName() + " pushed to [" + pushMsg.getRepository().getName() + "]: "+ commitMsg + " | bash /home/smsd/core/msgrelay.bash"; log.info("Running command: " + command); Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command}); diff --git a/src/main/java/uk/co/blatech/blaears/controllers/MsgRelayController.java b/src/main/java/uk/co/blatech/blaears/controllers/MsgRelayController.java index d3f9557..9a758d0 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/MsgRelayController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/MsgRelayController.java @@ -17,7 +17,7 @@ public class MsgRelayController { String relay(@RequestParam(value="text", required=true) String text, Model model){ try { //DANGER - //Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + text + " | bash /home/smsd/msgrelay.bash "}); + //Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + text + " | bash /home/smsd/core/msgrelay.bash "}); model.addAttribute("result", "OK"); } catch (Exception e) { System.out.println("Failed to run command echo theblueroom test " + text + " | bash /home/smsd/core/msgrelay.bash "); -- cgit v1.2.3