diff options
| -rw-r--r-- | src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java | 8 | ||||
| -rw-r--r-- | src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java | 2 |
2 files changed, 5 insertions, 5 deletions
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 b5e9df9..7b3a1aa 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java @@ -35,17 +35,17 @@ public class GitMergeController { String actionTxt = ""; if (action.equals("open")) { - actionTxt = " created a merge request from "; + actionTxt = " created a merge request from ["; } else if (action.equals("merge")) { - actionTxt = " merged from branch "; + actionTxt = " merged from branch ["; } else if (!action.equals("update")){ - actionTxt = " did a " + mergeMsg.getObjectAttributes().getAction() + " from "; + actionTxt = " did a " + mergeMsg.getObjectAttributes().getAction() + " from ["; } else { log.info ("Dropping update message"); 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/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 ab9971d..73d1b4b 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/msgrelay.bash "; log.info("Running command: " + command); Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command}); |