diff --git a/multi-watch.sh b/multi-watch.sh index 7a9f555..4493d6e 100644 --- a/multi-watch.sh +++ b/multi-watch.sh @@ -76,11 +76,16 @@ EOF if [ -z "$NEW_VAL" ] || [ "$NEW_VAL" == "null" ]; then continue; fi if [ -z "$OLD_VAL" ] || [ "$OLD_VAL" != "$NEW_VAL" ]; then - [ -z "$OLD_VAL" ] && echo " 🆕 Neuaufnahme." || { - MSG="Update für $CLEAN_REPO_NAME ($EXTRA)!" + if [ -z "$OLD_VAL" ]; then + echo " 🆕 Neuaufnahme." + else + # HIER DIE ÄNDERUNG: Typ voranstellen + MSG="[$TYPE] Update für: $CLEAN_REPO_NAME ($EXTRA)" echo " 🔔 $MSG" + # Wir fügen einen Zeilenumbruch für die Mail hinzu UPDATES_FOUND="${UPDATES_FOUND}${MSG}\n" - } + fi + # Speichern... NEW_JSON=$(jq ".[\"$KEY\"] = \"$NEW_VAL\"" "$STATE_FILE" 2>/dev/null) echo "$NEW_JSON" > "${STATE_FILE}.tmp" && mv "${STATE_FILE}.tmp" "$STATE_FILE" else @@ -93,16 +98,21 @@ EOF CLEAN_JSON=$(jq "with_entries(select(.key as \$k | $VALID_KEYS_JSON | index(\$k)))" "$STATE_FILE") echo "$CLEAN_JSON" > "$STATE_FILE" + # Mail Versand if [ -n "$UPDATES_FOUND" ]; then echo " 📧 Sende Benachrichtigung an $EMAIL_TO..." ( echo "To: $EMAIL_TO" - echo "Subject: Watchdog Alert" + echo "Subject: Watchdog Update Alert" echo "Content-Type: text/plain; charset=utf-8" echo "Content-Transfer-Encoding: 8bit" echo "" + echo "Der Watchdog hat folgende Updates gefunden:" + echo "------------------------------------------" echo -e "$UPDATES_FOUND" + echo "------------------------------------------" + echo "Check beendet am: $(date)" ) | timeout 30s msmtp "$EMAIL_TO" if [ $? -eq 0 ]; then