[Libreoffice-commits] .: solenv/bin

Tor Lillqvist tml at kemper.freedesktop.org
Sun Jul 3 05:32:30 PDT 2011


 solenv/bin/getcompver.awk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b7026b5e74cddf6bdda5357d65764c0da1e7679
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jul 3 15:26:24 2011 +0300

    Use \r instead of \x0d in awk pattern for portability
    
    Hex escapes in the regexps are not supported in Solaris nawk, for
    instance. \r should match a CR in all cases as far as I know.

diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 0689604..124e915 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -52,13 +52,13 @@ BEGIN {
     x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
     CCversion = substr( $0, RSTART, RLENGTH)
 }
-/^[0-9]*[.][0-9]*\x0d*$/ {
+/^[0-9]*[.][0-9]*\r*$/ {
     if ( compiler_matched == 0 ) {
 # need to blow to x.xx.xx for comparing
     	CCversion = $0 ".0"
     }
 }
-/^[0-9]*[.][0-9]*[.][0-9]*\x0d*$/ {
+/^[0-9]*[.][0-9]*[.][0-9]*\r*$/ {
     if ( compiler_matched == 0 ) {
         CCversion = $0
     }


More information about the Libreoffice-commits mailing list