From d2c15d04a1603c0a20fcedd0070d7c144cba28d8 Mon Sep 17 00:00:00 2001 From: Edward <73746306+WangEdward@users.noreply.github.com> Date: Wed, 25 Oct 2023 19:25:29 +0800 Subject: [PATCH 1/3] fix: ignore quarantine for linux cask download --- Library/Homebrew/cask/download.rb | 2 ++ Library/Homebrew/extend/os/cask/download.rb | 4 ++++ Library/Homebrew/extend/os/linux/cask/download.rb | 13 +++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 Library/Homebrew/extend/os/cask/download.rb create mode 100644 Library/Homebrew/extend/os/linux/cask/download.rb diff --git a/Library/Homebrew/cask/download.rb b/Library/Homebrew/cask/download.rb index 0182440b4e..e6cfd4f6ca 100644 --- a/Library/Homebrew/cask/download.rb +++ b/Library/Homebrew/cask/download.rb @@ -114,3 +114,5 @@ module Cask end end end + +require "extend/os/cask/download" diff --git a/Library/Homebrew/extend/os/cask/download.rb b/Library/Homebrew/extend/os/cask/download.rb new file mode 100644 index 0000000000..180793b696 --- /dev/null +++ b/Library/Homebrew/extend/os/cask/download.rb @@ -0,0 +1,4 @@ +# typed: true +# frozen_string_literal: true + +require "extend/os/linux/cask/download" if OS.linux? diff --git a/Library/Homebrew/extend/os/linux/cask/download.rb b/Library/Homebrew/extend/os/linux/cask/download.rb new file mode 100644 index 0000000000..6d453ff7e3 --- /dev/null +++ b/Library/Homebrew/extend/os/linux/cask/download.rb @@ -0,0 +1,13 @@ +# typed: true +# frozen_string_literal: true + +module Cask + class Download + undef quarantine + + def quarantine(_path) + opoo "Cannot quarantine download: No xattr available on linux." if @quarantine + nil + end + end +end From 25ab4a273322aa7fd178fdd5e655b1b1e226bfbe Mon Sep 17 00:00:00 2001 From: Edward <73746306+WangEdward@users.noreply.github.com> Date: Wed, 25 Oct 2023 21:21:28 +0800 Subject: [PATCH 2/3] Revert "fix: ignore quarantine for linux cask download" This reverts commit d2c15d04a1603c0a20fcedd0070d7c144cba28d8. --- Library/Homebrew/cask/download.rb | 2 -- Library/Homebrew/extend/os/cask/download.rb | 4 ---- Library/Homebrew/extend/os/linux/cask/download.rb | 13 ------------- 3 files changed, 19 deletions(-) delete mode 100644 Library/Homebrew/extend/os/cask/download.rb delete mode 100644 Library/Homebrew/extend/os/linux/cask/download.rb diff --git a/Library/Homebrew/cask/download.rb b/Library/Homebrew/cask/download.rb index e6cfd4f6ca..0182440b4e 100644 --- a/Library/Homebrew/cask/download.rb +++ b/Library/Homebrew/cask/download.rb @@ -114,5 +114,3 @@ module Cask end end end - -require "extend/os/cask/download" diff --git a/Library/Homebrew/extend/os/cask/download.rb b/Library/Homebrew/extend/os/cask/download.rb deleted file mode 100644 index 180793b696..0000000000 --- a/Library/Homebrew/extend/os/cask/download.rb +++ /dev/null @@ -1,4 +0,0 @@ -# typed: true -# frozen_string_literal: true - -require "extend/os/linux/cask/download" if OS.linux? diff --git a/Library/Homebrew/extend/os/linux/cask/download.rb b/Library/Homebrew/extend/os/linux/cask/download.rb deleted file mode 100644 index 6d453ff7e3..0000000000 --- a/Library/Homebrew/extend/os/linux/cask/download.rb +++ /dev/null @@ -1,13 +0,0 @@ -# typed: true -# frozen_string_literal: true - -module Cask - class Download - undef quarantine - - def quarantine(_path) - opoo "Cannot quarantine download: No xattr available on linux." if @quarantine - nil - end - end -end From f21af1e3ebcf99588fafa7cfd2d4c56345639c9e Mon Sep 17 00:00:00 2001 From: Edward <73746306+WangEdward@users.noreply.github.com> Date: Wed, 25 Oct 2023 21:22:06 +0800 Subject: [PATCH 3/3] fix: xattr check in download quarantine --- Library/Homebrew/cask/quarantine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/quarantine.rb b/Library/Homebrew/cask/quarantine.rb index e038011e64..446f42e3f3 100644 --- a/Library/Homebrew/cask/quarantine.rb +++ b/Library/Homebrew/cask/quarantine.rb @@ -33,7 +33,7 @@ module Cask def self.check_quarantine_support odebug "Checking quarantine support" - if !system_command(xattr, args: ["-h"], print_stderr: false).success? + if xattr.nil? || !system_command(xattr, args: ["-h"], print_stderr: false).success? odebug "There's no working version of `xattr` on this system." :xattr_broken elsif swift.nil?