|
@@ -43,7 +43,7 @@ end
|
|
|
require 'xmlsimple'
|
|
|
|
|
|
# add custom Lint jar
|
|
|
-if CUSTOM_LINT_FILE != nil &&
|
|
|
+if !CUSTOM_LINT_FILE.nil? &&
|
|
|
CUSTOM_LINT_FILE.length > 0
|
|
|
|
|
|
ENV["ANDROID_LINT_JARS"] = Dir.pwd + "/" + CUSTOM_LINT_FILE
|
|
@@ -93,7 +93,7 @@ end
|
|
|
previous_results = false
|
|
|
|
|
|
previous_lint_reports = Dir.glob(PREVIOUS_LINT_RESULTS_FILE)
|
|
|
-if previous_lint_reports == nil ||
|
|
|
+if previous_lint_reports.nil? ||
|
|
|
previous_lint_reports.length == 0
|
|
|
|
|
|
previous_lint_report = File.new(PREVIOUS_LINT_RESULTS_FILE, "w") # create for writing to later
|
|
@@ -151,10 +151,10 @@ end
|
|
|
File.write(previous_lint_report, "DO NOT TOUCH; GENERATED BY DRONE\n" + error_warning_string)
|
|
|
|
|
|
# push changes to github (if this script is run locally, we don't want to overwrite git username and email, so save temporarily)
|
|
|
-previous_git_username, st = Open3.capture2('git config user.name')
|
|
|
+previous_git_username, _ = Open3.capture2('git config user.name')
|
|
|
previous_git_username = previous_git_username.strip
|
|
|
|
|
|
-previous_git_email, st = Open3.capture3('git config user.email')
|
|
|
+previous_git_email, _ = Open3.capture3('git config user.email')
|
|
|
previous_git_email = previous_git_email.strip
|
|
|
|
|
|
# update git user name and email for this script
|
|
@@ -177,4 +177,4 @@ system("git config --local user.name '#{previous_git_username}'")
|
|
|
system("git config --local user.email '#{previous_git_email}'")
|
|
|
|
|
|
puts "SUCCESS: count was reduced"
|
|
|
-exit 0 # success
|
|
|
+exit 0 # success
|