bin/asciidoctor in asciidoctor-1.5.8 vs bin/asciidoctor in asciidoctor-2.0.0.rc.1

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'rubygems' unless defined? Gem
-
-if File.exist?(asciidoctor = (File.expand_path '../../lib/asciidoctor', __FILE__))
+asciidoctor = File.absolute_path '../lib/asciidoctor.rb', __dir__
+if File.exist? asciidoctor
   require asciidoctor
+  require File.join Asciidoctor::LIB_DIR, 'asciidoctor/cli'
 else
   require 'asciidoctor'
+  require 'asciidoctor/cli'
 end
-require 'asciidoctor/cli'
 
 invoker = Asciidoctor::Cli::Invoker.new ARGV
 GC.start
 invoker.invoke!
 exit invoker.code