From 70e909f624596a1569c38c4a1eb24522cfbde530 Mon Sep 17 00:00:00 2001 From: dogi Date: Wed, 20 Sep 2023 01:50:21 -0400 Subject: [PATCH] `treehouses feedback` better output (fixes #2287) (#2288) --- modules/feedback.sh | 7 +++---- package.json | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/feedback.sh b/modules/feedback.sh index 04d9578af..d65006990 100644 --- a/modules/feedback.sh +++ b/modules/feedback.sh @@ -9,13 +9,12 @@ function feedback { ip_address="invalid address" fi message="${message//\`/}" - message="${message// /\\b}" if [ "$(detectrpi)" != "nonrpi" ]; then - body="{\"content\":\"**$(hostname)**\b$ip_address\b$(version)\b$(detectrpi)\b$(cat /boot/version.txt)\n$message\"}" + body="{\"content\":\"**$(hostname)** $ip_address $(version) $(detectrpi) $(cat /boot/version.txt)\n$message\"}" else - body="{\"content\":\"**$(hostname)**\b$ip_address\b$(version)\b$(detect | sed "s/ /\\\b/1")\n$message\"}" + body="{\"content\":\"**$(hostname)** $ip_address $(version) $(detect)\n$message\"}" fi - curl -s -X POST -H "Content-Type:application/json" "$chat$hook" -d $body> "$LOGFILE" + curl -s -X POST -H "Content-Type:application/json" "$chat$hook" -d "$body" > "$LOGFILE" echo "Thanks for the feedback!" else log_and_exit1 "No feedback was submitted." diff --git a/package.json b/package.json index 7a5401147..a9ff345ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@treehouses/cli", - "version": "1.26.12", + "version": "1.26.13", "remote": "4000", "description": "Thin command-line interface for Raspberry Pi low level configuration.", "main": "cli.sh",