From f9c1d2df557be851cb8e53488365da91a36c278d Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 10 Aug 2017 18:02:33 +0200 Subject: [PATCH] fix lint-up --- scripts/lint/lint-up.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb index f18d2a272d..fe9d2ad578 100644 --- a/scripts/lint/lint-up.rb +++ b/scripts/lint/lint-up.rb @@ -111,18 +111,18 @@ else previous_error_warning_string = "" File.open previous_lint_report do |file| - previous_error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ } + previous_error_warning_string = file.find { |line| line =~ /([0-9]* error[s]? and )?[0-9]* warning[s]?/ } end unless previous_error_warning_string.nil? previous_results = true - previous_error_string = previous_error_warning_string.match(/[0-9]* errors/)[0] + previous_error_string = previous_error_warning_string.match(/[0-9]* error[s]?/)[0] previous_error_count = previous_error_string.match(/[0-9]*/)[0].to_i puts "previous errors: " + previous_error_count.to_s if CHECK_WARNINGS == true - previous_warning_string = previous_error_warning_string.match(/[0-9]* warnings/)[0] + previous_warning_string = previous_error_warning_string.match(/[0-9]* warning[s]?/)[0] previous_warning_count = previous_warning_string.match(/[0-9]*/)[0].to_i puts "previous warnings: " + previous_warning_count.to_s end