Commit c96800a
tools: fix license-builder.sh for ICU
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>1 parent 36a4159 commit c96800a
1 file changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,8 @@ addlicense "c-ares" "deps/cares" \ | |||
| 33 | 33 | "$(sed -e '/^ \*\/$/,$d' -e '/^$/d' -e 's/^[/ ]\* *//' ${rootdir}/deps/cares/src/ares_init.c)" | |
| 34 | 34 | addlicense "HTTP Parser" "deps/http_parser" "$(cat deps/http_parser/LICENSE-MIT)" | |
| 35 | 35 | addlicense "ICU" "deps/icu" \ | |
| 36 | - "$(sed -e '1,/COPYRIGHT AND PERMISSION NOTICE/d' -e '/^<hr/,$d' -e 's/^<\/*p>$//' ${rootdir}/deps/icu/license.html)" | ||
| 36 | + "$(sed -e '1,/ICU License - ICU 1\.8\.1 and later/d' -e :a \ | ||
| 37 | + -e 's/<[^>]*>//g;s/ / /g;s/ +$//;/</N;//ba' ${rootdir}/deps/icu/license.html)" | ||
| 37 | 38 | addlicense "libuv" "deps/uv" "$(cat ${rootdir}/deps/uv/LICENSE)" | |
| 38 | 39 | addlicense "OpenSSL" "deps/openssl" \ | |
| 39 | 40 | "$(sed -e '/^ \*\/$/,$d' -e '/^ [^*].*$/d' -e '/\/\*.*$/d' -e '/^$/d' -e 's/^[/ ]\* *//' ${rootdir}/deps/openssl/openssl/LICENSE)" | |
@@ -53,7 +54,7 @@ addlicense "marked" "tools/doc/node_modules/marked" \ | |||
| 53 | 54 | ||
| 54 | 55 | # Testing tools | |
| 55 | 56 | addlicense "cpplint.py" "tools/cpplint.py" \ | |
| 56 | - "$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' ${rootdir}/tools/cpplint.py | tail +3)" | ||
| 57 | + "$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' ${rootdir}/tools/cpplint.py | tail -n +3)" | ||
| 57 | 58 | addlicense "ESLint" "tools/eslint" "$(cat ${rootdir}/tools/eslint/LICENSE)" | |
| 58 | 59 | addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)" | |
| 59 | 60 | addlicense "node-weak" "test/gc/node_modules/weak" \ | |
0 commit comments