From ed592d7e880dfef2df762e1d1d7cf6eb534199a9 Mon Sep 17 00:00:00 2001 From: Michal Papis Date: Tue, 15 May 2012 07:25:02 +0200 Subject: [PATCH] simplify the env_shebang check, update #19 --- lib/rubygems-bundler/rubygems_bundler_installer.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/rubygems-bundler/rubygems_bundler_installer.rb b/lib/rubygems-bundler/rubygems_bundler_installer.rb index 68f28ab..911a6d9 100644 --- a/lib/rubygems-bundler/rubygems_bundler_installer.rb +++ b/lib/rubygems-bundler/rubygems_bundler_installer.rb @@ -24,11 +24,7 @@ def self.bundler_generate_bin(inst) def self.shebang(inst, bin_file_name) # options were defined first in 1.5, we want to support back to 1.3.7 - options_supported = inst.respond_to?('options') && inst.options - if (options_supported && inst.options[:env_shebang]) || inst.instance_variable_get(:@env_shebang) - ruby_name = Gem::ConfigMap[:ruby_install_name] - end - + ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.instance_variable_get(:@env_shebang) bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home) path = File.join bindir, inst.formatted_program_filename(bin_file_name) first_line = File.open(path, "rb") {|file| file.gets}