From 2ecc4479020fb2a1ebf858be1d2a6ef9a74b98d9 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Thu, 7 Jan 2021 20:59:23 +0100
Subject: [PATCH] Set system property file.encoding to utf-8 in all start
 scripts

---
 client/pom.xml                             | 3 ++-
 client/src/assembly/ctbrec-linux-jre.sh    | 2 +-
 client/src/assembly/ctbrec-linux.sh        | 2 +-
 client/src/assembly/ctbrec-macos-jre.sh    | 2 +-
 client/src/assembly/ctbrec-macos.sh        | 2 +-
 client/src/assembly/ctbrec.bat             | 2 +-
 server/src/assembly/ctbrec-systemd.service | 2 +-
 server/src/assembly/server-linux.sh        | 2 +-
 server/src/assembly/server-macos.sh        | 2 +-
 server/src/assembly/server.bat             | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 6c71a933..c6aad92e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -130,8 +130,9 @@
 									<jre>
 										<path>jre</path>
 										<bundledJre64Bit>true</bundledJre64Bit>
-										<minVersion>10</minVersion>
+										<minVersion>15</minVersion>
 										<maxHeapSize>512</maxHeapSize>
+										<opt>-Dfile.encoding=utf-8</opt>
 									</jre>
 									<versionInfo>
 										<fileVersion>${project.version}.0</fileVersion>
diff --git a/client/src/assembly/ctbrec-linux-jre.sh b/client/src/assembly/ctbrec-linux-jre.sh
index 3a284a4c..848617d6 100755
--- a/client/src/assembly/ctbrec-linux-jre.sh
+++ b/client/src/assembly/ctbrec-linux-jre.sh
@@ -4,5 +4,5 @@ DIR="$(dirname "$0")"
 pushd "${DIR}"
 JAVA=./jre/bin/java
 $JAVA -version
-$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
+$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 ctbrec.ui.Launcher
 popd
diff --git a/client/src/assembly/ctbrec-linux.sh b/client/src/assembly/ctbrec-linux.sh
index 4b73212a..2a95a1d7 100755
--- a/client/src/assembly/ctbrec-linux.sh
+++ b/client/src/assembly/ctbrec-linux.sh
@@ -4,5 +4,5 @@ DIR="$(dirname "$0")"
 pushd "${DIR}"
 JAVA=java
 $JAVA -version
-$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
+$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 ctbrec.ui.Launcher
 popd
diff --git a/client/src/assembly/ctbrec-macos-jre.sh b/client/src/assembly/ctbrec-macos-jre.sh
index 2d857f9f..ef21243f 100755
--- a/client/src/assembly/ctbrec-macos-jre.sh
+++ b/client/src/assembly/ctbrec-macos-jre.sh
@@ -5,5 +5,5 @@ pushd "$DIR"
 JAVA_HOME="$DIR/jre/Contents/Home"
 JAVA="$JAVA_HOME/bin/java"
 $JAVA -version
-$JAVA -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
+$JAVA -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 ctbrec.ui.Launcher
 popd
\ No newline at end of file
diff --git a/client/src/assembly/ctbrec-macos.sh b/client/src/assembly/ctbrec-macos.sh
index 70363914..28f5d6fa 100755
--- a/client/src/assembly/ctbrec-macos.sh
+++ b/client/src/assembly/ctbrec-macos.sh
@@ -4,5 +4,5 @@ DIR=$(dirname $0)
 pushd "$DIR"
 JAVA=java
 $JAVA -version
-$JAVA -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
+$JAVA -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 ctbrec.ui.Launcher
 popd
\ No newline at end of file
diff --git a/client/src/assembly/ctbrec.bat b/client/src/assembly/ctbrec.bat
index d3b2eaed..2a95c05b 100644
--- a/client/src/assembly/ctbrec.bat
+++ b/client/src/assembly/ctbrec.bat
@@ -1 +1 @@
-jre\bin\java -Xmx512m -cp ".;${name.final}.jar" ctbrec.ui.Launcher
\ No newline at end of file
+jre\bin\java -Xmx512m -cp ".;${name.final}.jar" -Dfile.encoding=utf-8 ctbrec.ui.Launcher
\ No newline at end of file
diff --git a/server/src/assembly/ctbrec-systemd.service b/server/src/assembly/ctbrec-systemd.service
index 6f786aca..6161776a 100644
--- a/server/src/assembly/ctbrec-systemd.service
+++ b/server/src/assembly/ctbrec-systemd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 WorkingDirectory=/opt/ctbrec
 SyslogIdentifier=ctbrec
-ExecStart=-/usr/bin/java -Xmx256m -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+ExecStart=-/usr/bin/java -Xmx256m -cp ${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 User=ctbrec
 Type=simple
 TimeoutSec=900
diff --git a/server/src/assembly/server-linux.sh b/server/src/assembly/server-linux.sh
index 3eadb7fa..206f479b 100755
--- a/server/src/assembly/server-linux.sh
+++ b/server/src/assembly/server-linux.sh
@@ -18,7 +18,7 @@ start() {
 
     # start ctbrec
     $JAVA -version
-    $JAVA -Xmx256m -cp "${DIR}:${DIR}/${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
+    $JAVA -Xmx256m -cp "${DIR}:${DIR}/${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
 
     # write a pid file
     echo $! > "${PIDFILE}"
diff --git a/server/src/assembly/server-macos.sh b/server/src/assembly/server-macos.sh
index c42ab687..43f4ffb2 100755
--- a/server/src/assembly/server-macos.sh
+++ b/server/src/assembly/server-macos.sh
@@ -4,5 +4,5 @@ DIR=$(dirname $0)
 pushd $DIR
 JAVA=java
 $JAVA -version
-$JAVA -Xmx192m -cp "${DIR}:${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+$JAVA -Xmx192m -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 popd
diff --git a/server/src/assembly/server.bat b/server/src/assembly/server.bat
index 05d408a7..a6278a4f 100755
--- a/server/src/assembly/server.bat
+++ b/server/src/assembly/server.bat
@@ -1 +1 @@
-java -Xmx192m -cp .;${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
\ No newline at end of file
+java -Xmx192m -cp .;${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
\ No newline at end of file