anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable convertDefault.sh to run even if its executable bit is not set.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/ChangeLog
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> 2003-08-28 Lars Gullik Bjønnes <larsbj@gullik.net>
* most files: change to use const Buffer refs * most files: change to use const Buffer refs

2
src/insets/insetgraphics.C
View File

@ -441,7 +441,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
// from ImageMagic: convert from:inname.from to:outname.to // from ImageMagic: convert from:inname.from to:outname.to
if (!converters.convert(&buf, temp_file, outfile_base, from, to)) { if (!converters.convert(&buf, temp_file, outfile_base, from, to)) {
string const command = string const command =
LibFileSearch("scripts", "convertDefault.sh") + "sh " + LibFileSearch("scripts", "convertDefault.sh") +
' ' + from + ':' + temp_file + ' ' + ' ' + from + ':' + temp_file + ' ' +
to + ':' + outfile_base + '.' + to; to + ':' + outfile_base + '.' + to;
lyxerr[Debug::GRAPHICS] lyxerr[Debug::GRAPHICS]