bin/asciidoctor in asciidoctor-1.5.3 vs bin/asciidoctor in asciidoctor-1.5.4

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'rubygems' if RUBY_VERSION < '1.9'
+require 'rubygems' unless defined? Gem
 
-if File.exist?(asciidoctor_lib_path = File.join(File.dirname(__FILE__), '../lib/asciidoctor'))
-  require asciidoctor_lib_path
+if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+  require asciidoctor
 else
   require 'asciidoctor'
 end
 require 'asciidoctor/cli'