summaryrefslogtreecommitdiff
path: root/Master/bin/sparc-solaris/updmap
diff options
context:
space:
mode:
Diffstat (limited to 'Master/bin/sparc-solaris/updmap')
-rwxr-xr-xMaster/bin/sparc-solaris/updmap9
1 files changed, 6 insertions, 3 deletions
diff --git a/Master/bin/sparc-solaris/updmap b/Master/bin/sparc-solaris/updmap
index c66303fdeee..0f8cc469a83 100755
--- a/Master/bin/sparc-solaris/updmap
+++ b/Master/bin/sparc-solaris/updmap
@@ -122,7 +122,7 @@ export PATH
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
# the version string
-version=1122009795 # seconds since `00:00:00 1970-01-01 UTC'
+version=1167072206 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
###############################################################################
@@ -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
}
###############################################################################