From ef2a9084dbfc48335ff1675713d58ce9f48c8f8a Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 19 May 2019 12:13:03 -0400 Subject: [PATCH] allow --help CLI option with no Rsconscript present - close #106 --- lib/rscons/cli.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/rscons/cli.rb b/lib/rscons/cli.rb index 2bf037a..2689785 100644 --- a/lib/rscons/cli.rb +++ b/lib/rscons/cli.rb @@ -121,21 +121,24 @@ module Rscons rsconscript = DEFAULT_RSCONSCRIPTS.find do |f| File.exists?(f) end - unless rsconscript - $stderr.puts "Could not find the Rsconscript to execute." - $stderr.puts "Looked for: #{DEFAULT_RSCONSCRIPTS.join(", ")}" - exit 1 - end end - script = Script.new - script.load(rsconscript) + if rsconscript + script = Script.new + script.load(rsconscript) + end if do_help puts USAGE exit 0 end + unless rsconscript + $stderr.puts "Could not find the Rsconscript to execute." + $stderr.puts "Looked for: #{DEFAULT_RSCONSCRIPTS.join(", ")}" + exit 1 + end + operation_options = parse_operation_args(operation, argv) || {} exit Rscons.application.run(operation, script, operation_options)