From 2151c59de2cbbf429818ed1d05d2d78df43dc49f Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Tue, 28 Nov 2023 15:39:04 +0000 Subject: [PATCH] Remove version from accessors --- Library/Homebrew/formula_creator.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/formula_creator.rb b/Library/Homebrew/formula_creator.rb index 0cfffb9404..24ed6e0962 100644 --- a/Library/Homebrew/formula_creator.rb +++ b/Library/Homebrew/formula_creator.rb @@ -10,7 +10,7 @@ module Homebrew # @api private class FormulaCreator attr_reader :url, :sha256, :desc, :homepage - attr_accessor :name, :version, :tap, :mode, :license + attr_accessor :name, :tap, :mode, :license def initialize(name, version, fetch: true, head: false) @name = name @@ -47,13 +47,13 @@ module Homebrew path = @tap.new_formula_path(@name) raise "#{path} already exists" if path.exist? - if version.nil? || version.null? + if @version.nil? || @version.null? odie "Version cannot be determined from URL. Explicitly set the version with `--set-version` instead." elsif @fetch unless @head r = Resource.new r.url(url) - r.version(version) + r.version(@version) r.owner = self @sha256 = r.fetch.sha256 if r.download_strategy == CurlDownloadStrategy end @@ -96,8 +96,8 @@ module Homebrew homepage "#{homepage}" <% unless @head %> url "#{url}" - <% unless version.detected_from_url? %> - version "#{version}" + <% unless @version.detected_from_url? %> + version "#{@version}" <% end %> sha256 "#{sha256}" <% end %> @@ -185,7 +185,7 @@ module Homebrew <% elsif mode == :ruby %> ENV["GEM_HOME"] = libexec system "gem", "build", "\#{name}.gemspec" - system "gem", "install", "\#{name}-\#{version}.gem" + system "gem", "install", "\#{name}-\#{@version}.gem" bin.install libexec/"bin/\#{name}" bin.env_script_all_files(libexec/"bin", GEM_HOME: ENV["GEM_HOME"]) <% elsif mode == :rust %>