From 584cd84b95fb9259a535f25e353906b6188f6b93 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bonicoli Date: Sun, 16 Jun 2024 18:35:02 +0200 Subject: [PATCH] =?UTF-8?q?rapport=20d'activit=C3=A9:=20le=20rapport=20g?= =?UTF-8?q?=C3=A9n=C3=A9r=C3=A9=20n'est=20pas=20du=20JSON?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrige #6265 --- rapport_activite/update_redmine_ticket.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/rapport_activite/update_redmine_ticket.sh b/rapport_activite/update_redmine_ticket.sh index 2b924ce..9a84355 100755 --- a/rapport_activite/update_redmine_ticket.sh +++ b/rapport_activite/update_redmine_ticket.sh @@ -12,21 +12,12 @@ main() { } post_report() { - datafile=$(mktemp /tmp/report_stats_$(date +%Y-%m-%d_%H%M)_XXXX.json) - cat < "${datafile}" -{ - "issue": { - "notes": "$(/srv/minetest.chapril.org/tools/rapport_activite/rapport_activite.sh -p| sed -z 's/\n/\\n/g')" - } -} -EOF - - curl -s \ + curl -v -s \ -H "Content-Type: application/json" \ -H "X-Redmine-API-Key: ${REDMINE_API_KEY}" \ - -X PUT --data-binary "@${datafile}" \ - "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json" - rm "${datafile}" + -X PUT --data-binary "@-" \ + "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json" \ + < <(/srv/minetest.chapril.org/tools/rapport_activite/rapport_activite_mineclone2.sh -p | jq --raw-input --slurp '{ "issue": {"notes": .} }') } last_comment_date() {