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
This commit is contained in:
Angus Leeming 2003-08-28 12:45:51 +00:00
parent 32d3374255
commit 24f8676130
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2003-08-28 Angus Leeming <leeming@lyx.org>
* 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 <larsbj@gullik.net>
* 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 <martin.vermeer@hut.fi>
2003-07-29 Martin Vermeer <martin.vermeer@hut.fi>
* 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 <leeming@lyx.org>

View File

@ -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]