ソースを参照

don't try to add parts - will look at this later

Pi 1 年間 前
コミット
3af53553b8
1 ファイル変更12 行追加4 行削除
  1. 12 4
      cropswap-sendmail.sh

+ 12 - 4
cropswap-sendmail.sh

@@ -20,6 +20,7 @@ fi
 reformail \
 	-X "Date:" \
 	-X "MIME-Version:" \
+	-X "Content-Type:" \
 	-I "Subject: ${subject}" \
 	-X "Subject:" \
 	-I "List-Id: $MAILGROUP" \
@@ -34,11 +35,18 @@ reformail \
 	-X "List-Unsubscribe-Post:" \
 < "${WD}/original" > "${WD}/headers"
 
-reformime -s1 -e < "${WD}/original" | makemime -c "$(reformail -c -x 'Content-Type:' < "${WD}/original")" - > "${WD}/body"
-echo "NOTICE:======== <<<" | makemime -c "text/plain" - > "${WD}/banner"
-makemime -m multipart/mixed "${WD}/banner" > "${WD}/new"
-makemime -j "${WD}/new" "${WD}/body" | cat "${WD}/headers" - > "${WD}/mail.new"
+# multipart/mixed isn't displaying all parts
+content_type="$(reformail -c -x 'Content-Type:' < "${WD}/original")"
+#reformime -s1 -e < "${WD}/original" | makemime -c "${content_type}" - > "${WD}/body"
+#echo "NOTICE:======== <<<" | makemime -c "text/plain" - > "${WD}/banner"
+#makemime -m multipart/mixed "${WD}/banner" > "${WD}/new"
+#makemime -j "${WD}/new" "${WD}/body" | cat "${WD}/headers" - > "${WD}/mail.new"
 
+# doesn't work on plain-text messages...
+#reformime -s1 -e < "${WD}/original" > "${WD}/body"
+#makemime -m "${content_type}" "${WD}/body" | cat "${WD}/headers" - > "${WD}/mail.new"
+
+reformime -s1 -e < "${WD}/original" | cat "${WD}/headers" - > "${WD}/mail.new"
 mv "${WD}"/mail{.new,}
 
 declare -A SUBSCRIBED