Merge pull request #20925 from Homebrew/linux_cask_handling

Improve Linux cask handling

Author: MikeMcQuaid

Library/Homebrew/cask/artifact/binary.rb

@@ -14,7 +14,7 @@ def link(command: nil, **options)
         if source.writable?
           FileUtils.chmod "+x", source
         else
-          command.run!("/bin/chmod", args: ["+x", source], sudo: true)
+          command.run!("chmod", args: ["+x", source], sudo: true)
         end
       end
     end

Library/Homebrew/cask/artifact/relocated.rb

@@ -93,7 +93,7 @@ def add_altname_metadata(file, altname, command:)
         altnames = "(#{altnames})"
 
         # Some packages are shipped as u=rx (e.g. Bitcoin Core)
-        command.run!("/bin/chmod",
+        command.run!("chmod",
                      args: ["--", "u+rw", file, file.realpath],
                      sudo: !file.writable? || !file.realpath.writable?)
 

Library/Homebrew/cask/caskroom.rb

@@ -47,10 +47,16 @@ def self.ensure_caskroom_exists
              "We'll set permissions properly so we won't need sudo in the future."
       end
 
-      SystemCommand.run("/bin/mkdir", args: ["-p", path], sudo:)
-      SystemCommand.run("/bin/chmod", args: ["g+rwx", path], sudo:)
-      SystemCommand.run("/usr/sbin/chown", args: [User.current.to_s, path], sudo:)
-      SystemCommand.run("/usr/bin/chgrp", args: ["admin", path], sudo:)
+      SystemCommand.run("mkdir", args: ["-p", path], sudo:)
+      SystemCommand.run("chmod", args: ["g+rwx", path], sudo:)
+      SystemCommand.run("chown", args: [User.current.to_s, path], sudo:)
+
+      chgrp_path(path, sudo)
+    end
+
+    sig { params(path: Pathname, sudo: T::Boolean).void }
+    def self.chgrp_path(path, sudo)
+      SystemCommand.run("chgrp", args: ["admin", path], sudo:)
     end
 
     # Get all installed casks.
@@ -69,3 +75,5 @@ def self.casks(config: nil)
     end
   end
 end
+
+require "extend/os/cask/caskroom"

Library/Homebrew/cask/quarantine.rb

@@ -185,7 +185,7 @@ def self.propagate(from: nil, to: nil)
                       args:  [
                         "-0",
                         "--",
-                        "/bin/chmod",
+                        "chmod",
                         "-h",
                         "u+w",
                       ],

Library/Homebrew/cask/staged.rb

@@ -18,8 +18,8 @@ def set_permissions(paths, permissions_str)
       full_paths = remove_nonexistent(paths)
       return if full_paths.empty?
 
-      @command.run!("/bin/chmod", args: ["-R", "--", permissions_str, *full_paths],
-                                  sudo: false)
+      @command.run!("chmod", args: ["-R", "--", permissions_str, *full_paths],
+                             sudo: false)
     end
 
     sig { params(paths: Paths, user: T.any(String, User), group: String).void }
@@ -28,8 +28,8 @@ def set_ownership(paths, user: T.must(User.current), group: "staff")
       return if full_paths.empty?
 
       ohai "Changing ownership of paths required by #{@cask} with `sudo` (which may request your password)..."
-      @command.run!("/usr/sbin/chown", args: ["-R", "--", "#{user}:#{group}", *full_paths],
-                                       sudo: true)
+      @command.run!("chown", args: ["-R", "--", "#{user}:#{group}", *full_paths],
+                             sudo: true)
     end
 
     private

Library/Homebrew/cask/utils.rb

@@ -19,7 +19,7 @@ def self.gain_permissions_mkpath(path, command: SystemCommand)
       if dir.writable?
         path.mkpath
       else
-        command.run!("/bin/mkdir", args: ["-p", "--", path], sudo: true, print_stderr: false)
+        command.run!("mkdir", args: ["-p", "--", path], sudo: true, print_stderr: false)
       end
     end
 
@@ -28,7 +28,7 @@ def self.gain_permissions_rmdir(path, command: SystemCommand)
         if p.parent.writable?
           FileUtils.rmdir p
         else
-          command.run!("/bin/rmdir", args: ["--", p], sudo: true, print_stderr: false)
+          command.run!("rmdir", args: ["--", p], sudo: true, print_stderr: false)
         end
       end
     end
@@ -77,10 +77,10 @@ def self.gain_permissions(path, command_args, command)
           command.run("/usr/bin/chflags",
                       print_stderr:,
                       args:         command_args + ["--", "000", path])
-          command.run("/bin/chmod",
+          command.run("chmod",
                       print_stderr:,
                       args:         command_args + ["--", "u+rwx", path])
-          command.run("/bin/chmod",
+          command.run("chmod",
                       print_stderr:,
                       args:         command_args + ["-N", path])
           tried_permissions = true
@@ -92,7 +92,7 @@ def self.gain_permissions(path, command_args, command)
           # TODO: Further examine files to see if ownership is the problem
           #       before using `sudo` and `chown`.
           ohai "Using sudo to gain ownership of path '#{path}'"
-          command.run("/usr/sbin/chown",
+          command.run("chown",
                       args: command_args + ["--", User.current, path],
                       sudo: true)
           tried_ownership = true

Library/Homebrew/cask/utils/rmdir.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 # Try removing as many empty directories as possible with a single
 # `rmdir` call to avoid or at least speed up the loop below.
-if /bin/rmdir -- "${@}" &>/dev/null
+if rmdir -- "${@}" &>/dev/null
 then
   exit
 fi
@@ -26,7 +26,7 @@ do
 
     # Some packages leave broken symlinks around; we clean them out before
     # attempting to `rmdir` to prevent extra cruft from accumulating.
-    /usr/bin/find -f "${path}" -- -mindepth 1 -maxdepth 1 -type l ! -exec /bin/test -e {} \; -delete || true
+    /usr/bin/find -f "${path}" -- -mindepth 1 -maxdepth 1 -type l ! -exec test -e {} \; -delete || true
   elif ! ${symlink} && [[ ! -e "${path}" ]]
   then
     # Skip paths that don't exists and aren't a broken symlink.
@@ -40,9 +40,9 @@ do
   elif ${directory}
   then
     # Delete directory if empty.
-    /usr/bin/find -f "${path}" -- -maxdepth 0 -type d -empty -exec /bin/rmdir -- {} \;
+    /usr/bin/find -f "${path}" -- -maxdepth 0 -type d -empty -exec rmdir -- {} \;
   else
     # Try `rmdir` anyways to show a proper error.
-    /bin/rmdir -- "${path}"
+    rmdir -- "${path}"
   fi
 done

Library/Homebrew/cli/parser.rb

@@ -759,5 +759,3 @@ def value_for_env(env)
     end
   end
 end
-
-require "extend/os/parser"

Library/Homebrew/extend/os/cask/caskroom.rb

@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "extend/os/linux/cask/caskroom" if OS.linux?

Library/Homebrew/extend/os/linux/cask/caskroom.rb

@@ -0,0 +1,19 @@
+# typed: strict
+# frozen_string_literal: true
+
+module OS
+  module Linux
+    module Cask
+      module Caskroom
+        module ClassMethods
+          sig { params(path: Pathname, _sudo: T::Boolean).void }
+          def chgrp_path(path, _sudo)
+            SystemCommand.run("chgrp", args: ["root", path], sudo: true)
+          end
+        end
+      end
+    end
+  end
+end
+
+Cask::Caskroom.singleton_class.prepend(OS::Linux::Cask::Caskroom::ClassMethods)