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

create: fix options handling

Browse Source
This commit is contained in:
EricFromCanada 2020-12-07 23:37:54 -05:00
parent 3fc8c703f2
commit c8e821d307
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Library/Homebrew/dev-cmd/create.rb
View File

@ -54,8 +54,7 @@ module Homebrew
switch "--HEAD", switch "--HEAD",
description: "Indicate that <URL> points to the package's repository rather than a file." description: "Indicate that <URL> points to the package's repository rather than a file."
flag "--set-name=", flag "--set-name=",
description: "Explicitly set the <name> of the new formula or cask.", description: "Explicitly set the <name> of the new formula or cask."
required_for: "--cask"
flag "--set-version=", flag "--set-version=",
description: "Explicitly set the <version> of the new formula or cask." description: "Explicitly set the <version> of the new formula or cask."
flag "--set-license=", flag "--set-license=",
@ -139,24 +138,24 @@ module Homebrew
def create_formula(args:) def create_formula(args:)
fc = FormulaCreator.new(args) fc = FormulaCreator.new(args)
fc.name = args.name fc.name = args.set_name
fc.version = args.version fc.version = args.set_version
fc.license = args.license fc.license = args.set_license
fc.tap = Tap.fetch(args.tap || "homebrew/core") fc.tap = Tap.fetch(args.tap || "homebrew/core")
raise TapUnavailableError, tap unless fc.tap.installed? raise TapUnavailableError, tap unless fc.tap.installed?
fc.url = args.named.first # Pull the first (and only) url from ARGV fc.url = args.named.first # Pull the first (and only) url from ARGV
fc.mode = if args.cmake? fc.mode = if args.autotools?
:cmake
elsif args.autotools?
:autotools :autotools
elsif args.meson? elsif args.cmake?
:meson :cmake
elsif args.crystal? elsif args.crystal?
:crystal :crystal
elsif args.go? elsif args.go?
:go :go
elsif args.meson?
:meson
elsif args.node? elsif args.node?
:node :node
elsif args.perl? elsif args.perl?
@ -170,7 +169,7 @@ module Homebrew
end end
if fc.name.nil? || fc.name.strip.empty? if fc.name.nil? || fc.name.strip.empty?
stem = Pathname.new(url).stem stem = Pathname.new(fc.url).stem.rpartition("=").last
print "Formula name [#{stem}]: " print "Formula name [#{stem}]: "
fc.name = __gets || stem fc.name = __gets || stem
fc.update_path fc.update_path
@ -181,18 +180,18 @@ module Homebrew
unless args.force? unless args.force?
if reason = MissingFormula.disallowed_reason(fc.name) if reason = MissingFormula.disallowed_reason(fc.name)
raise <<~EOS raise <<~EOS
#{fc.name} is not allowed to be created. The formula '#{fc.name}' is not allowed to be created.
#{reason} #{reason}
If you really want to create this formula use --force. If you really want to create this formula use `--force`.
EOS EOS
end end
if Formula.aliases.include? fc.name if Formula.aliases.include? fc.name
realname = Formulary.canonical_name(fc.name) realname = Formulary.canonical_name(fc.name)
raise <<~EOS raise <<~EOS
The formula #{realname} is already aliased to #{fc.name} The formula '#{realname}' is already aliased to '#{fc.name}'.
Please check that you are not creating a duplicate. Please check that you are not creating a duplicate.
To force creation use --force. To force creation use `--force`.
EOS EOS
end end
end end