bin/autoproj_bootstrap in autoproj-2.8.1 vs bin/autoproj_bootstrap in autoproj-2.8.2

@@ -292,11 +292,11 @@
                     env_for_child,
                     Gem.ruby, gem_program, 'which', 'bundler/setup',
                     out: '/dev/null')
                 return if !result
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 end
             end
 
@@ -312,18 +312,18 @@
                     env_for_child.merge('GEM_HOME' => gems_gem_home),
                     Gem.ruby, gem_program, 'install',
                         '--env-shebang', '--no-document', '--no-format-executable',
                         '--clear-sources', '--source', gem_source,
                         *local, "--bindir=#{File.join(gems_gem_home, 'bin')}",
-                        'bundler', **redirection)
+                        'bundle', **redirection)
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
                     nil
                 end
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 else
                     STDERR.puts "gem install bundler returned successfully, but still "\
                         "cannot find bundler in #{bundler_path}"
@@ -417,10 +417,10 @@
 if defined?(Bundler)
     Bundler.with_clean_env do
         exec($0, *ARGV)
     end
 end
-ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
                 RESTART_BUNDLER
                 script_lines.join
             end
 
             def self.shim_bundler_old(ruby_executable, autoproj_gemfile_path, gems_gem_home)