[svn-commits] mvanbaak: branch 1.6.0 r189851 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Wed Apr 22 09:32:43 2009
New Revision: 189851

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189851
Log:
Merged revisions 189850 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189850 | mvanbaak | 2009-04-22 16:30:47 +0200 (Wed, 22 Apr 2009) | 19 lines
  
  Merged revisions 189849 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189849 | mvanbaak | 2009-04-22 16:29:28 +0200 (Wed, 22 Apr 2009) | 12 lines
    
    replace sed with tr to remove \r from downloaded file
    
    On some systems, sed does not recognize \r in the pattern the way it
    was used here.
    Use tr instead because this works the same across systems.
    
    (closes issue #14936)
    Reported by: leobrown
    Patches: 
          2009042201_14936.diff.txt uploaded by mvanbaak (license 7)
    	  Tested by: leobrown, mvanbaak
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/get_ilbc_source.sh

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/get_ilbc_source.sh
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/contrib/scripts/get_ilbc_source.sh?view=diff&rev=189851&r1=189850&r2=189851
==============================================================================
--- branches/1.6.0/contrib/scripts/get_ilbc_source.sh (original)
+++ branches/1.6.0/contrib/scripts/get_ilbc_source.sh Wed Apr 22 09:32:43 2009
@@ -22,7 +22,7 @@
 
 wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
 
-wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | sed -e 's/\r//g' > codecs/ilbc/extract-cfile.awk
+wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | tr -d '\r' > codecs/ilbc/extract-cfile.awk
 
 (cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)