Fixed a system/local conflict problem
If blimpy gem is already installed, this ends up picking blimpy from the installed gem, as opposed to the local workspace.
This commit is contained in:
parent
cd1ebc211d
commit
2edd265e92
|
@ -10,12 +10,8 @@ rescue NameError
|
||||||
# I don't think we have YAML::ENGINE until Ruby 1.9
|
# I don't think we have YAML::ENGINE until Ruby 1.9
|
||||||
end
|
end
|
||||||
|
|
||||||
begin
|
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
|
||||||
require 'blimpy/cli'
|
require 'blimpy/cli'
|
||||||
rescue LoadError
|
|
||||||
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
|
|
||||||
require 'blimpy/cli'
|
|
||||||
end
|
|
||||||
|
|
||||||
# allow monkey-patching of Blimpy by the project (mainly to add more commands)
|
# allow monkey-patching of Blimpy by the project (mainly to add more commands)
|
||||||
blimprc = File.join(Dir.pwd,"Blimprc")
|
blimprc = File.join(Dir.pwd,"Blimprc")
|
||||||
|
|
Loading…
Reference in New Issue