lib/autoproj/package_managers/bundler_manager.rb in autoproj-2.8.2 vs lib/autoproj/package_managers/bundler_manager.rb in autoproj-2.8.3
- old
+ new
@@ -50,10 +50,11 @@
if File.file?(gemfile_path)
env.set('BUNDLE_GEMFILE', gemfile_path)
end
Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundle')
+ Autobuild.programs['bundle'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundle')
env.init_from_env 'RUBYLIB'
env.inherit 'RUBYLIB'
# Sanitize the rubylib we get from the environment by removing
# anything that comes from Gem or Bundler
@@ -211,10 +212,10 @@
'BUNDLE_GEMFILE' => gemfile,
'RUBYOPT' => nil,
'RUBYLIB' => nil
]
ws.run 'autoproj', 'osdeps',
- Autobuild.tool('bundler'), *commandline,
+ Autobuild.tool('bundle'), *commandline,
working_directory: File.dirname(gemfile), env: target_env do |line|
yield(line) if block_given?
end
end
end