Browse files

Removed require 'ftools'. Didn't appear to be used, and I'm not sure …

…what it is anyway.
  • Loading branch information...
1 parent 34b8cdc commit a94714af699358f32a233e17dcb9e44c22900545 @j05h j05h committed Jan 19, 2011
Showing with 5 additions and 6 deletions.
  1. +5 −6 bin/ejekyll
View
11 bin/ejekyll
@@ -4,7 +4,6 @@
require 'rubygems'
require 'jekyll'
-require 'ftools'
require File.join(File.dirname(__FILE__), '..', 'lib', 'aop.rb')
@@ -28,26 +27,26 @@ module Jekyll
class << self
alias_method :configuration_without_extensions, :configuration
def configuration_with_extensions(options)
- options = configuration_without_extensions(options)
+ options = configuration_without_extensions(options)
Dir[File.join(options['source'], "_extensions", "*.rb"), File.join(options['source'], "_extensions", "*", "*.rb")].each do |f|
puts "Loading Extension: #{File.basename(f)}"
load f
end
options
end
- alias_method :configuration, :configuration_with_extensions
-
+ alias_method :configuration, :configuration_with_extensions
+
# For jekyll versions below 0.6.2 (exclusive)
if method_defined? :version
alias_method :original_version, :version
def version
original_version + " (Extended)"
end
end
-
+
end
end
original_jekyll = ENV['PATH'].split(File::PATH_SEPARATOR).collect { |d| "#{d}/jekyll" }.find{ |p| File.exists?(p) }
-load original_jekyll
+load original_jekyll

0 comments on commit a94714a

Please sign in to comment.