shell/source/unix/misc/senddoc.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
New commits: commit e837d5570af3de1a420ad21ec035463cf9babdb7 Author: Eike Rathke <er...@redhat.com> Date: Mon Mar 18 17:48:59 2013 +0100 quote URI_ENCODE Change-Id: Ib3bb6065b02eee8de7c4ca16c8fda05385409703 diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index 3033605..cb287e6 100644 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -165,7 +165,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift ;; --attach) - ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2" | ${URI_ENCODE}` + ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2" | "${URI_ENCODE}"` shift ;; *) commit 71b248ef477248ff6a03d62cf0e3b724372680eb Author: Ariel Constenla-Haile <arie...@apache.org> Date: Wed Jun 27 20:52:20 2012 +0000 i82660 - SimpleCommandMail: fix options passed to Thunderbird diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index be096c8..3033605 100644 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -115,19 +115,19 @@ case `basename "$MAILER" | sed 's/-.*$//'` in done if [ "$TO" != "" ]; then - COMMAND=${COMMAND:-}${COMMAND:+,}to=${TO} + COMMAND=${COMMAND:-}${COMMAND:+,}to=\'${TO}\' fi if [ "$CC" != "" ]; then - COMMAND=${COMMAND:-}${COMMAND:+,}cc=${CC} + COMMAND=${COMMAND:-}${COMMAND:+,}cc=\'${CC}\' fi if [ "$BCC" != "" ]; then - COMMAND=${COMMAND:-}${COMMAND:+,}bcc=${BCC} + COMMAND=${COMMAND:-}${COMMAND:+,}bcc=\'${BCC}\' fi if [ "$SUBJECT" != "" ]; then - COMMAND=${COMMAND:-}${COMMAND:+,}subject=${SUBJECT} + COMMAND=${COMMAND:-}${COMMAND:+,}subject=\'${SUBJECT}\' fi if [ "$BODY" != "" ]; then - COMMAND=${COMMAND:-}${COMMAND:+,}body=${BODY} + COMMAND=${COMMAND:-}${COMMAND:+,}body=\'${BODY}\' fi if [ "$ATTACH" != "" ]; then COMMAND=${COMMAND:-}${COMMAND:+,}attachment=\'${ATTACH}\' commit 2f7bbb82deb6192a90e351bd962cfb57245e2df8 Author: Ariel Constenla-Haile <arie...@apache.org> Date: Wed Jun 27 20:52:14 2012 +0000 i82660 - SimpleCommandMail: fix options passed to Kmail Change-Id: I20f3411787b3965aaaad118d1ba6582acaa25f70 diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index 2002c3d..be096c8 100644 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -160,8 +160,12 @@ case `basename "$MAILER" | sed 's/-.*$//'` in BODY="$2" shift ;; + --from) + FROM="$2" + shift + ;; --attach) - ATTACH="$2" + ATTACH="${ATTACH:-}${ATTACH:+ }--attach "`echo "file://$2" | ${URI_ENCODE}` shift ;; *) @@ -170,9 +174,14 @@ case `basename "$MAILER" | sed 's/-.*$//'` in shift; done - ${MAILER} --composer ${CC:+--cc} ${CC:+"${CC}"} ${BCC:+--bcc} ${BCC:+"${BCC}"} \ - ${SUBJECT:+--subject} ${SUBJECT:+"${SUBJECT}"} ${BODY:+--body} ${BODY:+"${BODY}"} \ - ${ATTACH:+--attach} ${ATTACH:+"${ATTACH}"} ${TO:+"${TO}"} + ${MAILER} --composer \ + ${CC:+--cc} ${CC:+"${CC}"} \ + ${BCC:+--bcc} ${BCC:+"${BCC}"} \ + ${SUBJECT:+--subject} ${SUBJECT:+"${SUBJECT}"} \ + ${BODY:+--body} ${BODY:+"${BODY}"} \ + ${FROM:+--header} ${FROM:+"From: ${FROM}"} \ + ${ATTACH:+${ATTACH}} \ + ${TO:+"${TO}"} ;; mutt) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits