shell/source/unix/misc/senddoc.sh | 46 +++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 8188f9212fa5db9b9e65009ae1c94de2399c5f09
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Mar 11 11:00:49 2013 +0100
fdo#60701: Properly quote shell parameter expansions
(cherry picked from commit 5c32ac5104e9cade52c8a373033644282de9ceff)
Conflicts:
shell/source/unix/misc/senddoc.sh
Change-Id: Ic8a85f42e3781068c2aef3b6af23e0d992478d82
Reviewed-on: https://gerrit.libreoffice.org/2666
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/shell/source/unix/misc/senddoc.sh
b/shell/source/unix/misc/senddoc.sh
index a18562b..99067cc 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-URI_ENCODE="`dirname $0`/uri-encode"
+URI_ENCODE=`dirname "$0"`/uri-encode
FOPTS=""
sd_platform=`uname -s`
@@ -87,7 +87,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
shift
;;
--attach)
- ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" |
${URI_ENCODE}`
+ ATTACH=${ATTACH:-}${ATTACH:+,}`echo "file://$2" |
"${URI_ENCODE}"`
shift
;;
*)
@@ -221,23 +221,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
shift
;;
--cc)
- MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--bcc)
- MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--subject)
- MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--body)
- MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--attach)
- MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" |
"${URI_ENCODE}"`
shift
;;
*)
@@ -263,23 +263,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
shift
;;
--cc)
- MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--bcc)
- MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--subject)
- MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--body)
- MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--attach)
- MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo
"file://$2" | ${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo
"file://$2" | "${URI_ENCODE}"`
shift
;;
*)
@@ -340,7 +340,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
case $1 in
--attach)
#i95688# fix filenames containing accented chars, whatever
alien
- ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" |
${URI_ENCODE}`
+ ATTACH="${ATTACH:-}${ATTACH:+ }"`echo "file://$2" |
"${URI_ENCODE}"`
shift
;;
*)
@@ -366,23 +366,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
shift
;;
--cc)
- MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--bcc)
- MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--subject)
- MAILTO="${MAILTO:-}${MAILTO:+&}subject="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}subject="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--body)
- MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--attach)
- MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "$2"
| ${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}attachment="`echo "$2"
| "${URI_ENCODE}"`
shift
;;
*)
@@ -426,23 +426,23 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
shift
;;
--cc)
- MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}cc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--bcc)
- MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}bcc="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--subject)
- MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}subject"=`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--body)
- MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}body="`echo "$2" |
"${URI_ENCODE}"`
shift
;;
--attach)
- MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" |
${URI_ENCODE}`
+ MAILTO="${MAILTO:-}${MAILTO:+&}attach="`echo "file://$2" |
"${URI_ENCODE}"`
shift
;;
*)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
