From 4940ddb9fcc1484730781a9a0b2e30957a8f6735 Mon Sep 17 00:00:00 2001 From: Takeshi Watanabe Date: Thu, 22 Mar 2018 12:42:41 +0900 Subject: Add `:path` option for git repository. --- lib/mruby/build/load_gems.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/mruby/build/load_gems.rb b/lib/mruby/build/load_gems.rb index b48df6510..723be6ffc 100644 --- a/lib/mruby/build/load_gems.rb +++ b/lib/mruby/build/load_gems.rb @@ -76,9 +76,6 @@ module MRuby if params[:core] gemdir = "#{root}/mrbgems/#{params[:core]}" - elsif params[:path] - require 'pathname' - gemdir = Pathname.new(params[:path]).absolute? ? params[:path] : "#{root}/#{params[:path]}" elsif params[:git] url = params[:git] gemdir = "#{gem_clone_dir}/#{url.match(/([-\w]+)(\.[-\w]+|)$/).to_a[1]}" @@ -108,6 +105,11 @@ module MRuby # Jump to the top of the branch git.run_checkout gemdir, branch if $pull_gems end + + gemdir << "/#{params[:path]}" if params[:path] + elsif params[:path] + require 'pathname' + gemdir = Pathname.new(params[:path]).absolute? ? params[:path] : "#{root}/#{params[:path]}" else fail "unknown gem option #{params}" end -- cgit v1.2.3