Merge branch '11917-dont-clear-cache'

[arvados.git] / build / check-copyright-notices

diff --git a/build/check-copyright-notices b/build/check-copyright-notices
index d52c043bb80554915f7f6514b8c15037ec6b73eb..5298371bd1591fed7178cd6b839f90715b8a56c4 100755 (executable)
--- a/build/check-copyright-notices
+++ b/build/check-copyright-notices
@@ -43,7 +43,7 @@ done
 fixer() {
     want="${want}" perl -pi~ - "${1}" <<'EOF'
 BEGIN { undef $/ }
-s{^((\#\!.*?\n|\n*---\n.*?\n\.\.\.\n)\n?)?}{${2}$ENV{want}\n\n}ms
+s{^((\#\!.*?\n|\n*---\n.*?\n\.\.\.\n|<\?xml.*?>\n)\n?)?}{${2}$ENV{want}\n\n}ms
 EOF
 }
 
@@ -93,6 +93,7 @@ git ls-files -z ${@} | \
                 | *.sh | *.service \
                 | */run | */run-service | */restart-dns-server \
                 | */nodemanager/doc/*.cfg \
+                | */nodemanager/tests/fake*.cfg.template \
                 | */nginx.conf \
                 | build/build.list)
                 fixer=fixer
@@ -132,7 +133,13 @@ git ls-files -z ${@} | \
                 cc=""
                 ce=" */"
                 ;;
-            *.go | *.scss | *.java | *.js | *.coffee)
+            *.coffee)
+                fixer=fixer
+                cs="### "
+                cc=""
+                ce=" ###"
+                ;;
+            *.go | *.scss | *.java | *.js)
                 fixer=fixer
                 cc="//"
                 ;;
@@ -166,7 +173,7 @@ ${cc}
 ${cc}${cc:+ }SPDX-License-Identifier: CC-BY-SA-3.0${ce}"
         found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
         case ${fnm} in
-            Makefile | build/* | lib/* | tools/* | apps/* | services/*)
+            Makefile | build/* | lib/* | tools/* | apps/* | services/* | sdk/cli/bin/crunch-job)
                 want=${wantGPL}
                 ;;
             crunch_scripts/* | backports/* | docker/* | sdk/*)