From 3184aaf462a6087d8124738cac325ab5097b12f0 Mon Sep 17 00:00:00 2001
From: jpl
Date: Fri, 14 Oct 2016 11:01:19 +0200
Subject: merging issues

---
 bin/spring | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'bin/spring')

diff --git a/bin/spring b/bin/spring
index 7f24d96fb..7b45d374f 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end
-- 
cgit v1.2.3