From 114a5d715658b5d3da993366bcefc800a4388f17 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Thu, 25 Aug 2016 19:12:48 +0200
Subject: [PATCH] Personalise push notification - fix

---
 docker/runner/slack.json | 2 +-
 docker_push.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/runner/slack.json b/docker/runner/slack.json
index d00bd5002..ecde17346 100644
--- a/docker/runner/slack.json
+++ b/docker/runner/slack.json
@@ -1 +1 @@
-{"channel": "#dev-activity", "username": "webhookbot", "text": "${USER^} pushed a new version of hbpmip/portal-backend to Docker hub", "icon_emoji": ":whale:"}
+{"channel": "#dev-activity", "username": "webhookbot", "text": "USER pushed a new version of hbpmip/portal-backend to Docker hub", "icon_emoji": ":whale:"}
diff --git a/docker_push.sh b/docker_push.sh
index fdf341b3b..e064f5536 100755
--- a/docker_push.sh
+++ b/docker_push.sh
@@ -27,6 +27,6 @@ else
 fi
 
 $CAPTAIN push --branch-tags=false --commit-tags=true portal-backend
-eval "echo $(cat $WORKSPACE/docker/runner/slack.json)" > $WORKSPACE/target/slack.json
+cat $WORKSPACE/docker/runner/slack.json | sed "s/USER/${USER^}/" > $WORKSPACE/target/slack.json
 curl -k -X POST --data-urlencode payload@$WORKSPACE/target/slack.json https://hbps1.chuv.ch/slack/dev-activity
 rm -f $WORKSPACE/target/slack.json
-- 
GitLab