brew.rb: handle cask autoinstall when cask tapped.
Otherwise it would assume if `cask` was tapped it was also installed.
This commit is contained in:
parent
9b030d382c
commit
8d6b6a451b
@ -162,20 +162,26 @@ begin
|
|||||||
Tap.fetch("Homebrew", "services")
|
Tap.fetch("Homebrew", "services")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
command_installed = false
|
||||||
|
|
||||||
if possible_tap && !possible_tap.installed?
|
if possible_tap && !possible_tap.installed?
|
||||||
possible_tap.install
|
possible_tap.install
|
||||||
|
command_installed = true
|
||||||
if cmd == "cask"
|
|
||||||
require "cmd/install"
|
|
||||||
brew_cask = Formulary.factory("brew-cask")
|
|
||||||
Homebrew.install_formula(brew_cask)
|
|
||||||
end
|
|
||||||
|
|
||||||
exec HOMEBREW_BREW_FILE, cmd, *ARGV
|
|
||||||
end
|
end
|
||||||
|
|
||||||
onoe "Unknown command: #{cmd}"
|
if cmd == "cask" && (brew_cask = Formulary.factory("brew-cask")) \
|
||||||
exit 1
|
&& !brew_cask.installed?
|
||||||
|
require "cmd/install"
|
||||||
|
Homebrew.install_formula(brew_cask)
|
||||||
|
command_installed = true
|
||||||
|
end
|
||||||
|
|
||||||
|
if command_installed
|
||||||
|
exec HOMEBREW_BREW_FILE, cmd, *ARGV
|
||||||
|
else
|
||||||
|
onoe "Unknown command: #{cmd}"
|
||||||
|
exit 1
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
rescue FormulaUnspecifiedError
|
rescue FormulaUnspecifiedError
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user