Merge branch '13198-keep-web-metrics'
[arvados.git] / build / check-copyright-notices
index f087188991c5c06a3b19a3b1e38325d9d29e5c52..2a40b50ec1f5b94c2523e293871d04005d962973 100755 (executable)
@@ -96,7 +96,7 @@ do
             | */nodemanager/doc/*.cfg \
             | */nodemanager/tests/fake*.cfg.template \
             | */nginx.conf \
-            | build/build.list)
+            | build/build.list | *.R)
             fixer=fixer
             cc="#"
             ;;
@@ -175,7 +175,7 @@ ${cc}${cc:+ }SPDX-License-Identifier: CC-BY-SA-3.0${ce}"
     wantBYSAmd="[comment]: # (Copyright © The Arvados Authors. All rights reserved.)
 [comment]: # ()
 [comment]: # (SPDX-License-Identifier: CC-BY-SA-3.0)"
-    found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
+    found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*All rights reserved.' || true)
     case ${fnm} in
         Makefile | build/* | lib/* | tools/* | apps/* | services/* | sdk/cli/bin/crunch-job)
             want=${wantGPL}