From: Michiel van Baak Date: Wed, 22 Apr 2009 14:33:59 +0000 (+0000) Subject: Merged revisions 189850 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~314 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063d32955c71695d3f2691ef044a2bafa5d337bd;p=thirdparty%2Fasterisk.git 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@189852 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/scripts/get_ilbc_source.sh b/contrib/scripts/get_ilbc_source.sh index fd7bac12ed..89aa98c9f0 100755 --- a/contrib/scripts/get_ilbc_source.sh +++ b/contrib/scripts/get_ilbc_source.sh @@ -22,7 +22,7 @@ read tmp 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)