Another bugfix for the check-copyright-headers.rb script.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/git/hooks/check-copyright-headers.rb b/git/hooks/check-copyright-headers.rb
index e5d86a1b4bc95a8a80694069a4abbb7e686d39a1..2e32c59f8a6ff5c6da75f9a81c614ef7b372c06c 100755 (executable)
--- a/git/hooks/check-copyright-headers.rb
+++ b/git/hooks/check-copyright-headers.rb
@@ -83,8 +83,27 @@ def check_copyright_headers
         filename = f
         commit = `git show #{tmp[0]} -- #{f}`
         if commit =~ /^new file mode \d{6}\nindex 000000/
-          /^.*?@@\n(.*)$/m.match(commit)
-          header = `echo "#{$1}" | head -n20 | egrep -A3 -B1 'Copyright.*All rights reserved.'`
+          headerCount = 0
+          lineCount = 0
+          header = ""
+          previousLine = ""
+          commit.each_line do |line|
+            if ((headerCount == 0) and (line =~ /Copyright.*All rights reserved./))
+              header = previousLine
+              header += line
+              headerCount = 1
+            elsif ((headerCount > 0) and (headerCount < 3))
+              header += line
+              headerCount += 1
+            elsif (headerCount == 3)
+              break
+            end
+            previousLine = line
+            lineCount += 1
+            if lineCount > 50
+              break
+            end
+          end
           broken = check_file(filename, header, broken)
         end
       end