1.1 --- a/common/bin/compare.sh Thu Jan 03 20:54:38 2013 +0100
1.2 +++ b/common/bin/compare.sh Fri Jan 04 11:31:00 2013 +0100
1.3 @@ -1,6 +1,6 @@
1.4 #!/bin/bash
1.5 #
1.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
1.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
1.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 #
1.10 # This code is free software; you can redistribute it and/or modify it
1.11 @@ -113,12 +113,15 @@
1.12 fi
1.13 fi
1.14 if test "x$SUFFIX" = "xproperties"; then
1.15 - $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
1.16 - | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
1.17 - | $SED -e '/^#/d' -e '/^$/d' \
1.18 - -e :a -e '/\\$/N; s/\\\n//; ta' \
1.19 - -e 's/^[ \t]*//;s/[ \t]*$//' \
1.20 - -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
1.21 + # Run through nawk to add possibly missing newline at end of file.
1.22 + $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
1.23 +# Disable this exception since we aren't changing the properties cleaning method yet.
1.24 +# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
1.25 +# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
1.26 +# | $SED -e '/^#/d' -e '/^$/d' \
1.27 +# -e :a -e '/\\$/N; s/\\\n//; ta' \
1.28 +# -e 's/^[ \t]*//;s/[ \t]*$//' \
1.29 +# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
1.30 TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
1.31 fi
1.32 if test -n "$TMP"; then
