From 377c63366f6d06236d6e846722acf84deee8026f Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Thu, 13 Feb 2020 10:15:24 +0900 Subject: [PATCH] test/rubygems/test_gem_commands_setup_command.rb: Allow /bin/env Follow up of 65201c054a90c8e7beb8fe1e6d0006541ac33449 --- test/rubygems/test_gem_commands_setup_command.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index 9dc88d582a..d2e04d760b 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -184,15 +184,11 @@ class TestGemCommandsSetupCommand < Gem::TestCase ruby_exec = sprintf Gem.default_exec_format, 'ruby' - if Gem.win_platform? - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_gem_bin_path) - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path) - assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path) - else - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_gem_bin_path) - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path) - assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path) - end + bin_env = win_platform? ? "" : %w(/usr/bin/env /bin/env).find {|f| File.executable?(f) } + + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(default_gem_bin_path) + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(default_bundle_bin_path) + assert_match %r%\A#!#{bin_env}\s*#{ruby_exec}%, File.read(gem_bin_path) end def test_pem_files_in