From ace6bfe30072687b2430c639169d74e326da1818 Mon Sep 17 00:00:00 2001 From: zuk Date: Mon, 27 Apr 2009 17:41:05 -0400 Subject: [PATCH] use the load_picnic script for loading the Picnic depenency in rubycas-server-ctl --- bin/rubycas-server-ctl | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/bin/rubycas-server-ctl b/bin/rubycas-server-ctl index 09029e5..a1580d7 100755 --- a/bin/rubycas-server-ctl +++ b/bin/rubycas-server-ctl @@ -1,20 +1,6 @@ #!/usr/bin/env ruby -if File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../vendor/picnic/lib')) - $: << picnic -elsif File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../../picnic/lib')) - $: << picnic -else - require 'rubygems' - - # make things backwards-compatible for rubygems < 0.9.0 - if respond_to?(:require_gem) - puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!" - alias gem require_gem - end - - gem 'picnic' -end +require File.expand_path(File.dirname(__FILE__)+"/../lib/casserver/load_picnic") require 'picnic/service_control'