[sikuli] 364/385: JRubyScript: fix UTF-8 script processing

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 19:26:37 UTC 2014


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit f18370e68f124f780bc9bfb03a943746217f0b31
Author: rssdev10 <rssdev10 at gmail.com>
Date:   Wed Apr 23 22:45:22 2014 +0400

    JRubyScript: fix UTF-8 script processing
---
 JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
old mode 100755
new mode 100644
index aff14c2..6863f54
--- a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+++ b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
@@ -11,6 +11,9 @@ import org.sikuli.basics.Debug;
 import org.sikuli.basics.IScriptRunner;
 
 import java.io.File;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 //import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
@@ -260,7 +263,9 @@ public class JRubyScriptRunner implements IScriptRunner {
 			} else {
 				filename = ruFile.getAbsolutePath();
 				if (scriptPaths != null) {
-					FileReader script = new FileReader(ruFile.getAbsolutePath());
+					BufferedReader script = new BufferedReader(
+						new InputStreamReader(
+							new FileInputStream(ruFile.getAbsolutePath()), "UTF-8"));
 // TODO implement compile only !!!
 					if (scriptPaths[0].toUpperCase().equals(COMPILE_ONLY)) {
 						log(lvl, "runRuby: running COMPILE_ONLY");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git



More information about the pkg-java-commits mailing list