From 2943f3da29c083aa1be876be523b42cced156e8b Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 28 Nov 2003 09:39:16 +0000 Subject: [PATCH] Safe use of 'cut' with Win32 filenames. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8146 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 5 +++++ lib/scripts/convertDefault.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 4212724622..7962dea729 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-11-28 Angus Leeming + + * scripts/convertDefault.sh: use cut in preference to sed, but use it + safely. + 2003-11-27 Martin Vermeer * layouts/db_stdclass.inc: diff --git a/lib/scripts/convertDefault.sh b/lib/scripts/convertDefault.sh index 80f4a150f8..5cfc73909d 100644 --- a/lib/scripts/convertDefault.sh +++ b/lib/scripts/convertDefault.sh @@ -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" -- 2.39.2