Small refactoring in our bin

oddlyzen · Mar 4, 2010 · 0e48a14 · 0e48a14
1 parent da8d4ac
commit 0e48a14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/padrino-core/bin/padrino b/padrino-core/bin/padrino
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$:.unshift File.dirname(__FILE__) + "/../lib"
+
+padrino_core_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-core/cli/base'
 

diff --git a/padrino-gen/bin/padrino-gen b/padrino-gen/bin/padrino-gen
@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$:.unshift File.dirname(__FILE__) + "/../lib"
+padrino_gen_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
 
 # We try to load the vendored padrino-core if exist
-if File.exist?(File.dirname(__FILE__) + "/../../padrino-core/lib")
-  $:.unshift File.dirname(__FILE__) + "/../../padrino-core/lib"
-end
+padrino_core_path = File.expand_path('../../../padrino-core/lib', __FILE__)
+$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-gen'
 require 'padrino-gen/generators/cli'