From 06d655bf50e9838acd1dea3c001cc79b37d960a3 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Tue, 6 Apr 2021 11:19:05 +0800 Subject: [PATCH 1/2] match .gz man page files Emacs cask has compressed man pages and they should be supported. --- Library/Homebrew/cask/artifact/manpage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/artifact/manpage.rb b/Library/Homebrew/cask/artifact/manpage.rb index 3824296cbd..2c085154de 100644 --- a/Library/Homebrew/cask/artifact/manpage.rb +++ b/Library/Homebrew/cask/artifact/manpage.rb @@ -12,7 +12,7 @@ module Cask attr_reader :section def self.from_args(cask, source) - section = source.to_s[/\.([1-8]|n|l)$/, 1] + section = source.to_s[/\.([1-8]|n|l)(?:\.gz)?$/, 1] raise CaskInvalidError, "'#{source}' is not a valid man page name" unless section From 3c18e98432c2ac867e568e84b05be635c85c0920 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Tue, 6 Apr 2021 16:52:56 +0800 Subject: [PATCH 2/2] test .gz man page --- .../Homebrew/test/cask/artifact/manpage_spec.rb | 3 +++ .../support/fixtures/cask/AppWithManpage.zip | Bin 354 -> 488 bytes .../Casks/with-autodetected-manpage-section.rb | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/test/cask/artifact/manpage_spec.rb b/Library/Homebrew/test/cask/artifact/manpage_spec.rb index 5cfacd2b2e..9a447b7d0d 100644 --- a/Library/Homebrew/test/cask/artifact/manpage_spec.rb +++ b/Library/Homebrew/test/cask/artifact/manpage_spec.rb @@ -23,6 +23,8 @@ describe Cask::Artifact::Manpage, :cask do let(:source_path) { cask.staged_path.join("manpage.1") } let(:target_path) { cask.config.manpagedir.join("man1/manpage.1") } + let(:gz_source_path) { cask.staged_path.join("gzpage.1.gz") } + let(:gz_target_path) { cask.config.manpagedir.join("man1/gzpage.1.gz") } before do InstallHelper.install_without_artifacts(cask) @@ -35,6 +37,7 @@ describe Cask::Artifact::Manpage, :cask do install_phase.call expect(File).to be_identical target_path, source_path + expect(File).to be_identical gz_target_path, gz_source_path end end end diff --git a/Library/Homebrew/test/support/fixtures/cask/AppWithManpage.zip b/Library/Homebrew/test/support/fixtures/cask/AppWithManpage.zip index 938933a1cae691c0e8cad55eac5521f21e1369ae..0fc0ba5d3cc3f54477a425dcf2b63c69ae770039 100644 GIT binary patch delta 189 zcmaFF^n!VU4(yKy4I2o9? z%jYD3aA^fM10%~