make "make distcheck" work

[lyx.git] / lib / scripts / convertDefault.sh

diff --git a/lib/scripts/convertDefault.sh b/lib/scripts/convertDefault.sh
index 80f4a150f819d07ed380b3075127d68ccb1977aa..3b4c720b0307a8b0f4cf89141287846e0afcbdd7 100644 (file)
--- a/lib/scripts/convertDefault.sh
+++ b/lib/scripts/convertDefault.sh
@@ -15,7 +15,7 @@
 # replacement in ~/.lyx/scripts
 
 # converts an image from $1 to $2 format
-convert -depth 8 $1 $2 || {
+convert -depth 8 "$1" "$2" || {
        echo "$0 ERROR"
        echo "Execution of \"convert\" failed."
        exit 1
@@ -24,10 +24,11 @@ convert -depth 8 $1 $2 || {
 # It appears that convert succeeded, but we know better than to trust it ;-)
 # convert is passed strings in the form "FMT:FILENAME", so use the ':' to
 # delimit the two parts.
-# Do not use 'cut' because Win32 filenames have the form 'C:\my\file'.
-FILE=`echo $arg2 | sed 's,^[^:]*:,,'`
+# Note that Win32 filenames have the form 'C:\my\file',
+# so use everything from the first ':' to the end of the line.
+FILE=`echo "$2" | cut -d ':' -f 2-`
 
-test -f $FILE || {
+test -f "$FILE" || {
        echo "$0 ERROR"
        echo "Unable to find file \"${FILE}\""
        exit 1