From b62a5f615187248e8dbbf741c9bd90885eacf644 Mon Sep 17 00:00:00 2001 From: Eric Wang Date: Sun, 12 Jul 2020 15:37:24 -0400 Subject: [PATCH 1/2] Use Hardware::CPU.arch instead of MacOS.preferred_arch for READLINE_ARCH Calling MacOS.preferred_arch triggers the following warning during installation: Warning: Calling MacOS.preferred_arch is deprecated! Use Hardware::CPU.arch (or ideally let the compiler handle it) instead. --- homebrew/gitsh.rb.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homebrew/gitsh.rb.in b/homebrew/gitsh.rb.in index fac6316f..295afacd 100644 --- a/homebrew/gitsh.rb.in +++ b/homebrew/gitsh.rb.in @@ -44,6 +44,6 @@ class Gitsh < Formula end def set_architecture - ENV['READLINE_ARCH'] = "-arch #{MacOS.preferred_arch}" + ENV['READLINE_ARCH'] = "-arch #{Hardware::CPU.arch}" end end From c6c32ba84304c7e08571d58fa5a979fe5047eb3f Mon Sep 17 00:00:00 2001 From: Eric Wang Date: Sun, 12 Jul 2020 15:49:13 -0400 Subject: [PATCH 2/2] Update style guide link in CONTRIBUTING --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 891d012b..34469d09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -158,4 +158,4 @@ When updating Rubygems for gitsh, there are a few things to consider: - Use the minimum supported Ruby version when updating gems to avoid installing versions that are incompatible with older Rubies. -[style-guide]: https://github.com/thoughtbot/guides/tree/master/style#ruby +[style-guide]: https://github.com/thoughtbot/guides/tree/master/ruby