Enable convertDefault.sh to work reliably under Windows.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9739 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a7107e6dc98fd6b296e8990091dd76b9cccdb455..0cffce95da59f3564aeaa776502cacf336c71973 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-23  Angus Leeming  <leeming@lyx.org>
+
+       * scripts/convertDefault.sh: remove the test that "convert" really,
+       really succeeded, because it reports failures on Windows that are
+       actually successes. See, eg,
+       http://marc.theaimsgroup.com/?l=lyx-users&m=110561697803860&w=2
+
 2005-03-17  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * reLyX/syntax.default: update natbib/jurabib commands, add

diff --git a/lib/scripts/convertDefault.sh b/lib/scripts/convertDefault.sh
index 3b4c720b0307a8b0f4cf89141287846e0afcbdd7..c6240e53199725f64a91b908b2d34ccea1c8aeed 100644 (file)
--- a/lib/scripts/convertDefault.sh
+++ b/lib/scripts/convertDefault.sh
@@ -20,18 +20,3 @@ convert -depth 8 "$1" "$2" || {
        echo "Execution of \"convert\" failed."
        exit 1
 }
-
-# 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.
-# 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" || {
-       echo "$0 ERROR"
-       echo "Unable to find file \"${FILE}\""
-       exit 1
-}
-
-echo "$0 generated file \"${FILE}\" successfully."