From 7825e8363d4b2ccad8e2d3f5eeba9e26f6656911 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Dec 2017 23:08:05 +0000
Subject: Postponing the Bundler merge.

  I faced a big issue about Bundler with ruby core.
  I have no time to resolve it issue before 2.5 final release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 bin/bundle  | 31 -------------------------------
 bin/bundler |  4 ----
 2 files changed, 35 deletions(-)
 delete mode 100755 bin/bundle
 delete mode 100755 bin/bundler

(limited to 'bin')

diff --git a/bin/bundle b/bin/bundle
deleted file mode 100755
index aaf773745d..0000000000
--- a/bin/bundle
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# Exit cleanly from an early interrupt
-Signal.trap("INT") do
-  Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
-  exit 1
-end
-
-require "bundler"
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
-end
-
-require "bundler/friendly_errors"
-Bundler.with_friendly_errors do
-  require "bundler/cli"
-
-  # Allow any command to use --help flag to show help for that command
-  help_flags = %w[--help -h]
-  help_flag_used = ARGV.any? {|a| help_flags.include? a }
-  args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
-
-  Bundler::CLI.start(args, :debug => true)
-end
diff --git a/bin/bundler b/bin/bundler
deleted file mode 100755
index d9131fe834..0000000000
--- a/bin/bundler
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-load File.expand_path("../bundle", __FILE__)
-- 
cgit v1.2.3