rapport d'activité: le rapport généré n'est pas du JSON

Corrige #6265

rapport_activite/rapport_activite_mineclone2.sh

@@ -58,7 +58,7 @@ generateReport()
         deadCount=$(zgrep " died at " /var/log/minetest/30009-mineclone2.log-${month}* | wc -l)
         echo "Nombre de morts                              = $deadCount"
 
-        accountTotalCount=$(su -c "psql -U postgres -d minetest-auth --tuples-only -c \"SELECT COUNT(*) FROM auth\"" postgres | xargs 2> /dev/null)
+        accountTotalCount=$(su -l -c "psql -U postgres -d minetest-auth --tuples-only -c \"SELECT COUNT(*) FROM auth\"" postgres | xargs 2> /dev/null)
         echo "Nombre de comptes total                      = $accountTotalCount"
 
         warningCount=$(zgrep "WARNING" /var/log/minetest/30009-mineclone2.log-${month}* | wc -l)
@@ -67,7 +67,7 @@ generateReport()
         errorCount=$(zgrep "ERROR" /var/log/minetest/30009-mineclone2.log-${month}* | wc -l)
         echo "Nombre d'erreurs                             = $errorCount"
 
-        mcl2_databasesSize=$(su -c "psql -U postgres --tuples-only -c \"SELECT ROUND((CAST(SUM(pg_database_size(datname)) AS decimal) / 1024 / 1024)::numeric, 2) FROM pg_database WHERE datname LIKE 'minetest%mineclone2'\"" postgres | xargs 2> /dev/null)
+        mcl2_databasesSize=$(su -l -c "psql -U postgres --tuples-only -c \"SELECT ROUND((CAST(SUM(pg_database_size(datname)) AS decimal) / 1024 / 1024)::numeric, 2) FROM pg_database WHERE datname LIKE 'minetest%mineclone2'\"" postgres | xargs 2> /dev/null)
         echo "Taille des bases de données mineclone2       = $mcl2_databasesSize MB"
 
         echo -e "\n"
@@ -91,7 +91,7 @@ elif [ "$#" = 1 ] && [ "$1" = "-p" ]; then
         month="$year$precedingMonth"
     fi
     monthEnglish=$(LANG=en_EN.UTF-8;date -d $year-$precedingMonth-01 +%b)
-    echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $monthEnglish $year"
+    echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $monthEnglish $year"
     generateReport "$monthEnglish" "$month" "$year"
 elif [ "$#" -eq 2 ]; then
     if ! (let "$1") 2>/dev/null; then
@@ -117,14 +117,14 @@ elif [ "$#" -eq 2 ]; then
         fi
         monthEnglish=$(LANG=en_EN.UTF-8;date -d "$2-$1-01" +%b)
         year="$2"
-        echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $monthEnglish $2"
+        echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $monthEnglish $2"
         generateReport "$monthEnglish" "$month" "$year"
     fi
 elif [ "$#" -eq 0 ]; then
     month="$(date +%Y%m)"
     monthEnglish=$(LANG=en_EN.UTF-8;date +%b)
     year="$(date +%Y)"
-    echo -e "Rapport d'activité du service minetest.chapril.org -instance mineclone2- du mois $(date +%b) 20$(date +%y)"
+    echo -e "Rapport d'activité du service minetest.chapril.org - instance mineclone2 - du mois $(date +%b) 20$(date +%y)"
     generateReport "$monthEnglish" "$month" "$year"
 else
     echo -e "Bad parameter."

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)
+    curl -v -s \
-    cat <<EOF > "${datafile}"
-{
-  "issue": {
-    "notes": "$(/srv/minetest.chapril.org/tools/rapport_activite/rapport_activite.sh -p| sed -z 's/\n/\\n/g')" 
-  }
-}
-EOF
-
-    curl -s \
         -H "Content-Type: application/json" \
         -H "X-Redmine-API-Key: ${REDMINE_API_KEY}" \
-        -X PUT --data-binary "@${datafile}" \
+        -X PUT --data-binary "@-" \
-        "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json" 
+        "${REDMINE_BASE_URL}/issues/${REDMINE_TICKET_ID}.json" \
-    rm "${datafile}"
+        < <(/srv/minetest.chapril.org/tools/rapport_activite/rapport_activite_mineclone2.sh -p | jq --raw-input --slurp '{ "issue": {"notes": .} }')
 }
 
 last_comment_date() {