Safe use of 'cut' with Win32 filenames.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8146 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4212724622d345c78cdb8253f0ad729124791f69..7962dea72967f18f18caf1ec0f2f4d6c564f5970 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -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:

diff --git a/lib/scripts/convertDefault.sh b/lib/scripts/convertDefault.sh
index 80f4a150f819d07ed380b3075127d68ccb1977aa..5cfc73909dbb19265f8b4eaa1c397398f097d80f 100644 (file)
--- 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"