Safe use of 'cut' with Win32 filenames.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8146 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-11-28 09:39:16 +00:00
parent e5c07a21d5
commit 2943f3da29
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2003-11-28 Angus Leeming <leeming@lyx.org>
* scripts/convertDefault.sh: use cut in preference to sed, but use it
safely.
2003-11-27 Martin Vermeer <martin.vermeer@hut.fi>
* layouts/db_stdclass.inc:

View File

@ -24,8 +24,9 @@ convert -depth 8 $1 $2 || {
# 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.
# Do not use 'cut' because Win32 filenames have the form 'C:\my\file'.
FILE=`echo $arg2 | sed 's,^[^:]*:,,'`
# 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"