Skip to content
Snippets Groups Projects
Commit 3b6d8091 authored by Markus Reiter's avatar Markus Reiter
Browse files

Fix cask installation from untapped Tap not working.

parent 2b45ae48
No related branches found
No related tags found
No related merge requests found
......@@ -2,11 +2,21 @@ require "hbc/source/tapped"
class Hbc::Source::TappedQualified < Hbc::Source::Tapped
def self.me?(query)
!Hbc::QualifiedToken.parse(query).nil? && path_for_query(query).exist?
return if (tap = tap_for_query(query)).nil?
tap.installed? && path_for_query(query).exist?
end
def self.tap_for_query(query)
qualified_token = Hbc::QualifiedToken.parse(query)
return if qualified_token.nil?
user, repo, token = qualified_token
Tap.fetch(user, repo)
end
def self.path_for_query(query)
user, repo, token = Hbc::QualifiedToken.parse(query)
Tap.new(user, repo).cask_dir.join(token.sub(%r{(\.rb)?$}i, ".rb"))
Tap.fetch(user, repo).cask_dir.join(token.sub(%r{(\.rb)?$}i, ".rb"))
end
end
require "hbc/source/tapped_qualified"
class Hbc::Source::UntappedQualified < Hbc::Source::TappedQualified
def self.path_for_query(query)
user, repo, token = Hbc::QualifiedToken.parse(query)
def self.me?(query)
return if (tap = tap_for_query(query)).nil?
tap = Tap.fetch(user, repo)
tap.install unless tap.installed?
tap.cask_dir.join(token.sub(%r{(\.rb)?$}i, ".rb"))
tap.install
tap.installed? && path_for_query(query).exist?
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment