2411: Fix up whitespace.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/build/check-copyright-notices b/build/check-copyright-notices
index 41576c3ffa63859f6b9e06b3d29cea0c6bd2dab9..d52c043bb80554915f7f6514b8c15037ec6b73eb 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?)?}{${1}$ENV{want}\n\n}ms
+s{^((\#\!.*?\n|\n*---\n.*?\n\.\.\.\n)\n?)?}{${2}$ENV{want}\n\n}ms
 EOF
 }
 
@@ -108,27 +108,27 @@ git ls-files -z ${@} | \
                 ;;
             *.erb)
                 fixer=fixer
-                cs="<%#"
+                cs="<%# "
                 cc=""
                 ce=" %>"
                 ;;
             *.liquid)
                 fixer=fixer
                 cs=$'{% comment %}\n'
-                cc=
+                cc=""
                 ce=$'\n{% endcomment %}'
                 grepAfter=3
                 grepBefore=1
                 ;;
             *.textile)
                 fixer=fixer
-                cs="###."
+                cs="###. "
                 cc="...."
                 ce=
                 ;;
             *.css)
                 fixer=fixer
-                cs="/*"
+                cs="/* "
                 cc=""
                 ce=" */"
                 ;;
@@ -143,7 +143,7 @@ git ls-files -z ${@} | \
             *.html | *.svg)
                 fixer=fixer
                 cs="<!-- "
-                cc=
+                cc=""
                 ce=" -->"
                 ;;
             *)
@@ -155,16 +155,16 @@ git ls-files -z ${@} | \
                 fi
                 ;;
         esac
-        wantGPL="${cs:-${cc}} Copyright (C) The Arvados Authors. All rights reserved.
+        wantGPL="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
 ${cc}
 ${cc}${cc:+ }SPDX-License-Identifier: AGPL-3.0${ce}"
-        wantApache="${cs:-${cc}} Copyright (C) The Arvados Authors. All rights reserved.
+        wantApache="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
 ${cc}
 ${cc}${cc:+ }SPDX-License-Identifier: Apache-2.0${ce}"
-        wantBYSA="${cs:-${cc}} Copyright (C) The Arvados Authors. All rights reserved.
+        wantBYSA="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
 ${cc}
 ${cc}${cc:+ }SPDX-License-Identifier: CC-BY-SA-3.0${ce}"
-        found=$(head "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
+        found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
         case ${fnm} in
             Makefile | build/* | lib/* | tools/* | apps/* | services/*)
                 want=${wantGPL}