admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #12663 from XuehaiPan/patch-short-flags

Browse Source 
style: use short flags for `patch` command for compatibility
This commit is contained in:
Mike McQuaid 2022-01-03 14:38:15 +00:00 committed by GitHub
commit bd7e26b620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/style.rb
View File

@ -180,13 +180,14 @@ module Homebrew
if fix if fix
# patch options: # patch options:
# --get=0 : suppress environment variable `PATCH_GET`, ignore RCS, ClearCase, Perforce, and SCCS # -g 0 (--get=0) : suppress environment variable `PATCH_GET`
# --force : we know what we are doing, force apply patches # -f (--force) : we know what we are doing, force apply patches
# --directory=/ : change to root directory, since we use absolute file paths # -d / (--directory=/) : change to root directory, since we use absolute file paths
# --strip=0 : do not strip path prefixes, since we are at root directory # -p0 (--strip=0) : do not strip path prefixes, since we are at root directory
patch_command = %w[patch --get=0 --force --directory=/ --strip=0] # NOTE: we use short flags where for compatibility
patch_command = %w[patch -g 0 -f -d / -p0]
patches = system_command(shellcheck, args: ["--format=diff", *args]).stdout patches = system_command(shellcheck, args: ["--format=diff", *args]).stdout
Utils.safe_popen_write(*patch_command) { |p| p.write(patches) } Utils.safe_popen_write(*patch_command) { |p| p.write(patches) } if patches.present?
end end
case output_type case output_type