[Truffle] Run irb instead of reading from stdin by default.

jruby · Dec 10, 2016 · 0f5ac1e · 0f5ac1e
1 parent 2a7c4dd
commit 0f5ac1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java b/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java
@@ -616,7 +616,7 @@ private String resolve(String path, String scriptName) {
         return null;
     }
 
-    private String resolveScript(String scriptName) {
+    public String resolveScript(String scriptName) {
         // These try/catches are to allow failing over to the "commands" logic
         // when running from within a jruby-complete jar file, which has
         // jruby.home = a jar file URL that does not resolve correctly with

diff --git a/truffle/src/main/java/org/jruby/truffle/options/RubyInstanceConfig.java b/truffle/src/main/java/org/jruby/truffle/options/RubyInstanceConfig.java
@@ -96,8 +96,12 @@ private void initEnvironment() {
     }
 
     public void processArguments(String[] arguments) {
-        new ArgumentProcessor(arguments, this).processArguments();
+        final ArgumentProcessor processor = new ArgumentProcessor(arguments, this);
+        processor.processArguments();
         tryProcessArgumentsWithRubyopts();
+        if (getScriptFileName() == null && System.console() != null) {
+            setScriptFileName(processor.resolveScript("irb"));
+        }
     }
 
     public void tryProcessArgumentsWithRubyopts() {