diff options
author | Karl Berry <karl@freefriends.org> | 2006-11-14 02:16:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-11-14 02:16:40 +0000 |
commit | 89af8afe6ae2ab035329a005a7cf660e16babb0f (patch) | |
tree | cba74c408f4a509604efb5bdc52b40940cc3932d | |
parent | b3cf29cb2972a6923bfa0b7950d9b5aa4932d93d (diff) |
(normalizeLines): remove CR characters (for
skaknew), so that the generted map files have
consistent line endings for svn.
git-svn-id: svn://tug.org/texlive/trunk@2437 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/texk/tetex/updmap | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Build/source/texk/tetex/updmap b/Build/source/texk/tetex/updmap index c66303fdeee..ced046f76b9 100755 --- a/Build/source/texk/tetex/updmap +++ b/Build/source/texk/tetex/updmap @@ -1052,7 +1052,8 @@ syncWithTrees() ############################################################################### # normalizeLines() # remove comments, whitespace is exactly one space, no empty lines, -# no whitespace at end of line, one space before and after " +# no whitespace at end of line, one space before and after ", +# no CR's (as in skaknew). ############################################################################### normalizeLines() { @@ -1062,7 +1063,9 @@ normalizeLines() -e '/^ *$/d' \ -e 's@ $@@' \ -e 's@ *" *@ " @g' \ - -e 's@" \([^"]*\) "@"\1"@g' | sort | uniq + -e 's@" \([^"]*\) "@"\1"@g' \ + | tr -d '\r' \ + | sort | uniq } ############################################################################### |