From 5d2e69ad4f2b6214df52c617f5e6cb23d9f40944 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sat, 18 May 2013 16:57:59 -0700
Subject: set BUNDLE_GEMFILE env variable, if required.

---
 bin/nickserver | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nickserver b/bin/nickserver
index f392efe..8843dde 100755
--- a/bin/nickserver
+++ b/bin/nickserver
@@ -11,9 +11,10 @@ def load_library(name)
     begin                    # try it as a gem
       require 'rubygems'
       require name
-    rescue LoadError         # try manually
+    rescue LoadError         # try manually, requiring gems in Gemfile if it exists.
       base_directory = File.expand_path('../..', File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
       if File.exists?("#{base_directory}/Gemfile.lock")
+        ENV['BUNDLE_GEMFILE'] ||= "#{base_directory}/Gemfile"
         require 'bundler'
         Bundler.require(:default)
       end
-- 
cgit v1.2.3