Add check that --help was used

oracle · May 23, 2022 · 9a1edd4 · 9a1edd4
1 parent ecfbc76
commit 9a1edd4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -35,6 +35,7 @@ public class RubyLauncher extends AbstractLanguageLauncher {
 
     private CommandLineOptions config;
     private String implementationName = null;
+    private boolean helpOptionUsed;
 
     public static void main(String[] args) {
         new RubyLauncher().launch(args);
@@ -175,9 +176,19 @@ protected AbortException abortUnrecognizedArgument(String argument) {
                 "truffleruby: invalid option " + argument + "  (Use --help for usage instructions.)");
     }
 
+    @Override
+    protected boolean parseCommonOption(String defaultOptionPrefix, Map<String, String> polyglotOptions,
+            boolean experimentalOptions, String arg) {
+        if (arg.startsWith("--help")) {
+            helpOptionUsed = true;
+        }
+
+        return super.parseCommonOption(defaultOptionPrefix, polyglotOptions, experimentalOptions, arg);
+    }
+
     @Override
     protected boolean runLauncherAction() {
-        if (System.console() == null) {
+        if (!helpOptionUsed || System.console() == null) {
             return super.runLauncherAction();
         }