Handle old-style build lines for copyright

Author: afbjorklund

hack/boilerplate/boilerplate.go

@@ -34,7 +34,7 @@ var (
 	skippedPaths   = regexp.MustCompile(`Godeps|third_party|_gopath|_output|\.git|cluster/env.sh|vendor|test/e2e/generated/bindata.go|site/themes/docsy|test/integration/testdata|hack/benchmark/image-build/minikube-image-benchmark|hack/benchmark/time-to-k8s/time-to-k8s-repo`)
 	windowdNewLine = regexp.MustCompile(`\r`)
 	txtExtension   = regexp.MustCompile(`\.txt`)
-	goBuildTag     = regexp.MustCompile(`(?m)^(//go:build.*\n)+\n`)
+	goBuildTag     = regexp.MustCompile(`(?m)^(//go:build.*\n|// +build.*\n)+\n`)
 	shebang        = regexp.MustCompile(`(?m)^(#!.*\n)\n*`)
 	copyright      = regexp.MustCompile(`Copyright YEAR`)
 	copyrightReal  = regexp.MustCompile(`Copyright \d{4}`)

hack/boilerplate/fix.sh

@@ -30,11 +30,11 @@ function prepend() {
     local file_headers=""
 
     if [ "${headers}" != "" ]; then
-      file_headers="$(cat ${f} | grep ${headers})"
+      file_headers="$(cat ${f} | grep -E ${headers})"
     fi
 
     if [ "${file_headers}" != "" ]; then
-        fileContent="$(cat ${f} | grep -v ${headers})"
+        fileContent="$(cat ${f} | grep -v -E ${headers})"
         printf '%s\n\n%s\n%s\n' "$file_headers" "${copyright}" "$fileContent" > ${f}
     else
       fileContent="$(cat ${f})"
@@ -44,7 +44,7 @@ function prepend() {
     done
 }
 
-prepend "\.go" "go" "go:build"
+prepend "\.go" "go" "go:build|\+build"
 prepend "\.py" "py"
 prepend "\.sh" "sh" "#!"
 prepend Makefile Makefile