From 518af675fb5e2c7632e4538ccb812931cf4d5a3a Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 1 Sep 2020 11:20:39 -0700 Subject: [PATCH 1/3] Fix reading HOMEBREW_LIVECHECK_WATCHLIST file --- Library/Homebrew/dev-cmd/livecheck.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index cc01e76c17c92..ddc41f20a5414 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -58,7 +58,7 @@ def livecheck args.formulae elsif File.exist?(WATCHLIST_PATH) begin - WATCHLIST_PATH.read.lines.map do |line| + Pathname.new(WATCHLIST_PATH).read.lines.map do |line| next if line.start_with?("#") Formula[line.strip] From 9480de8f5dc0d92e3a3982133c39e524b5e3f559 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 1 Sep 2020 11:44:47 -0700 Subject: [PATCH 2/3] Default .brew_livecheck_watchlist to String type --- Library/Homebrew/dev-cmd/livecheck.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index ddc41f20a5414..ff45284c39550 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -10,7 +10,7 @@ module Homebrew WATCHLIST_PATH = ( ENV["HOMEBREW_LIVECHECK_WATCHLIST"] || - Pathname.new(Dir.home)/".brew_livecheck_watchlist" + "#{Dir.home}/.brew_livecheck_watchlist" ).freeze def livecheck_args From 2d0369fd50e523ae0038655cf221c015fa2c982b Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 1 Sep 2020 11:45:05 -0700 Subject: [PATCH 3/3] Fix whitespace --- Library/Homebrew/dev-cmd/livecheck.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index ff45284c39550..91aa1cef88b84 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -10,7 +10,7 @@ module Homebrew WATCHLIST_PATH = ( ENV["HOMEBREW_LIVECHECK_WATCHLIST"] || - "#{Dir.home}/.brew_livecheck_watchlist" + "#{Dir.home}/.brew_livecheck_watchlist" ).freeze def livecheck_args