If 'convert' fails returns the exit status else tests that the file was actually generated.
Ok to go in Lars? -- Angus
Index: lib/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v retrieving revision 1.348 diff -u -p -r1.348 ChangeLog --- lib/ChangeLog 13 Jan 2003 16:52:19 -0000 1.348 +++ lib/ChangeLog 13 Jan 2003 23:05:08 -0000 @@ -1,3 +1,8 @@ +2003-01-13 Angus Leeming <[EMAIL PROTECTED]> + + * scripts/convertDefault.sh: make it return the exit status of the + convert program. + 2003-01-13 Martin Vermeer <[EMAIL PROTECTED]> * doc/LaTeXConfig.lyx.in: document AGU and EGS classes Index: lib/scripts/convertDefault.sh =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/scripts/convertDefault.sh,v retrieving revision 1.4 diff -u -p -r1.4 convertDefault.sh --- lib/scripts/convertDefault.sh 15 Aug 2002 16:26:02 -0000 1.4 +++ lib/scripts/convertDefault.sh 13 Jan 2003 23:05:10 -0000 @@ -1,10 +1,23 @@ -#!/bin/sh -# this is the default converter if no one other was -# defined by the user in edit->preferences->converter +#! /bin/sh +# The default converter if no other has been defined by the user from the +# Conversion->Converter tab of the Preferences dialog. # -# the user can also redefine this default converter -# with an own shell script in ~/.lyx/scripts +# The user can also redefine this default converter, placing their +# replacement in ~/.lyx/scripts # -# converts an image from $1 to $2 format -convert -depth 8 $1 $2 -exit 0 +# converts an image from $1 to $2 format +convert -depth 8 $1 $2 +if [ $? -ne 0 ]; then + exit $? +fi + +# 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. +FILE=`echo $2 | cut -d ':' -f 2` + +# FSTATUS == 0 is the file exists and == 1 if it does not. +FSTATUS=0 +test -f $FILE || FSTATUS=1 + +exit $FSTATUS
