From 24f8676130d1e0769db394b7142dae7eeb1d955e Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 28 Aug 2003 12:45:51 +0000 Subject: [PATCH] Enable convertDefault.sh to run even if its executable bit is not set. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7627 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 10 ++++++++-- src/insets/insetgraphics.C | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 0a7cf3e439..5bb9bda925 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,9 @@ +2003-08-28 Angus Leeming + + * insetgraphics.C (prepareFile): prepend "convertDefault.sh" with + "sh ", enabling the conversion to be carried out even if the script + is not executable. + 2003-08-28 Lars Gullik Bjønnes * most files: change to use const Buffer refs @@ -165,10 +171,10 @@ * insetfootlike.C: * insettabular.C: parantheses, localize vars etc. -2003-07-29 Martin Vermeer +2003-07-29 Martin Vermeer * insetnote.C: Implement a newenvironment in preamble for - greyedout. Patch provided by Jürgen Spitzmüller. + greyedout. Patch provided by Jürgen Spitzmüller. 2003-07-29 Angus Leeming diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 647e9c525a..59b811390d 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -441,7 +441,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf, // from ImageMagic: convert from:inname.from to:outname.to if (!converters.convert(&buf, temp_file, outfile_base, from, to)) { string const command = - LibFileSearch("scripts", "convertDefault.sh") + + "sh " + LibFileSearch("scripts", "convertDefault.sh") + ' ' + from + ':' + temp_file + ' ' + to + ':' + outfile_base + '.' + to; lyxerr[Debug::GRAPHICS] -- 2.39.2