Permalink
Browse files

Fixed redefinition of BINARY and LIBDIR

  • Loading branch information...
1 parent bf4348c commit 88896c4476aafc3f37f7be92f9e9b68360d8d5e0 @bitcababy committed Mar 30, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/spork.rb
View
@@ -1,8 +1,8 @@
$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
require 'pathname'
module Spork
- BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork')
- LIBDIR = Pathname.new(File.expand_path(File.dirname(__FILE__)))
+ BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork') unless defined? BINARY
+ LIBDIR = Pathname.new(File.expand_path(File.dirname(__FILE__))) unless defined? LIBDIR
autoload :Server, (LIBDIR + 'spork/server').to_s
autoload :TestFramework, (LIBDIR + 'spork/test_framework').to_s

0 comments on commit 88896c4

Please sign in to comment.