bin/alog in autoproj-2.7.1 vs bin/alog in autoproj-2.8.0

@@ -1,22 +1,22 @@
 #! /usr/bin/env ruby
 
 require 'autoproj/cli/main'
 require 'autoproj/cli/locate'
 
-if ARGV.include?('--help') || ARGV.include?('help')
+argv = Autoproj::CLI.basic_setup
+if argv.include?('--help') || argv.include?('help')
     puts "Usage:"
     puts "  alog [package]"
     puts
     puts "Shows log available for the given package and allows to select and display one"
     exit 0
 end
 
-Autoproj::CLI.basic_setup
 Autoproj.report(silent: true) do
     cli = Autoproj::CLI::Locate.new
 
-    arg = ARGV.first || Dir.pwd
+    arg = argv.first || Dir.pwd
     if File.directory?(arg)
         arg = "#{File.expand_path(arg)}/"
     end
     log_files = cli.logs_of(arg, log: nil)