[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - shell/source

Stephan Bergmann Mon, 11 Mar 2013 04:30:18 -0700

 shell/source/unix/misc/senddoc.sh |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)


New commits:
commit 4b49fa35226791e3ee262af7f2ce664aa3d38424
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/2661
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index 0ff1594..2002c3d 100644
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-URI_ENCODE="`dirname $0`/uri-encode"
+URI_ENCODE=`dirname "$0"`/uri-encode
 FOPTS=""
 sd_platform=`uname -s`
 
@@ -105,7 +105,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
                     ;;
                 *)
@@ -239,23 +239,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
                     ;;
                 *)
@@ -281,23 +281,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
                     ;;
                 *)
@@ -358,7 +358,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
                     ;;
                 *)
@@ -400,23 +400,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
                     ;;
                 *)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - shell/source

Reply via email to