bundle: simplify flatpak with conditional gates

Author: ahmedadan

Library/Homebrew/bundle/flatpak_installer.rb

@@ -9,11 +9,7 @@ def self.reset!
       end
 
       def self.preinstall!(name, verbose: false, remote: "flathub", **_options)
-        unless Bundle.flatpak_installed?
-          puts "Installing flatpak. It is not currently installed." if verbose
-          Bundle.brew("install", "--formula", "flatpak", verbose:)
-          raise "Unable to install #{name} package. Flatpak installation failed." unless Bundle.flatpak_installed?
-        end
+        return false unless Bundle.flatpak_installed?
 
         # Check if package is installed at all (regardless of remote)
         if package_installed?(name)
@@ -25,6 +21,7 @@ def self.preinstall!(name, verbose: false, remote: "flathub", **_options)
       end
 
       def self.install!(name, preinstall: true, verbose: false, force: false, remote: "flathub", **_options)
+        return true unless Bundle.flatpak_installed?
         return true unless preinstall
 
         puts "Installing #{name} Flatpak from #{remote}. It is not currently installed." if verbose

Library/Homebrew/cmd/bundle.rb

@@ -12,6 +12,8 @@ class Bundle < AbstractCommand
 
           Bundler for non-Ruby dependencies from Homebrew, Homebrew Cask, Mac App Store, Visual Studio Code (and forks/variants), Go packages and Flatpak.
 
+          Note: Flatpak support is only available on Linux.
+
           `brew bundle` [`install`]:
           Install and upgrade (by default) all dependencies from the `Brewfile`.
 
@@ -110,7 +112,7 @@ class Bundle < AbstractCommand
         switch "--go",
                description: "`list` or `dump` Go packages."
         switch "--flatpak",
-               description: "`list` or `dump` Flatpak packages."
+               description: "`list` or `dump` Flatpak packages. Note: Linux only."
         switch "--no-vscode",
                description: "`dump` without VSCode (and forks/variants) extensions.",
                env:         :bundle_dump_no_vscode

Library/Homebrew/extend/os/bundle/flatpak_checker.rb

@@ -1,5 +1,2 @@
 # typed: strict
 # frozen_string_literal: true
-
-require "extend/os/mac/bundle/flatpak_checker" if OS.mac?
-require "extend/os/linux/bundle/flatpak_checker" if OS.linux?

Library/Homebrew/extend/os/bundle/flatpak_dumper.rb

@@ -1,5 +1,2 @@
 # typed: strict
 # frozen_string_literal: true
-
-require "extend/os/mac/bundle/flatpak_dumper" if OS.mac?
-require "extend/os/linux/bundle/flatpak_dumper" if OS.linux?

Library/Homebrew/extend/os/bundle/flatpak_installer.rb

@@ -1,5 +1,2 @@
 # typed: strict
 # frozen_string_literal: true
-
-require "extend/os/mac/bundle/flatpak_installer" if OS.mac?
-require "extend/os/linux/bundle/flatpak_installer" if OS.linux?