From a5834e3533d602e7fc8db96f54a56f5d037d7a30 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sun, 20 Dec 2020 17:07:05 +0100
Subject: [PATCH] Add the logback config to the root directory of the assembly

---
 client/pom.xml                          | 2 +-
 client/src/assembly/ctbrec-linux-jre.sh | 5 +++--
 client/src/assembly/ctbrec-linux.sh     | 5 +++--
 client/src/assembly/ctbrec-macos-jre.sh | 4 ++--
 client/src/assembly/ctbrec-macos.sh     | 4 ++--
 client/src/assembly/ctbrec.bat          | 1 +
 client/src/assembly/linux-jre.xml       | 4 ++++
 client/src/assembly/macos-jre.xml       | 4 ++++
 client/src/assembly/win64-jre.xml       | 9 +++++++++
 server/src/assembly/server-linux.sh     | 2 +-
 server/src/assembly/server-macos.sh     | 2 +-
 server/src/assembly/server.bat          | 2 +-
 server/src/assembly/server.xml          | 4 ++++
 server/src/main/resources/logback.xml   | 2 +-
 14 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 client/src/assembly/ctbrec.bat

diff --git a/client/pom.xml b/client/pom.xml
index a41574e1..e9d13863 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -124,7 +124,7 @@
 									<classPath>
 										<mainClass>ctbrec.ui.Launcher</mainClass>
 										<addDependencies>false</addDependencies>
-										<preCp>anything</preCp>
+										<preCp>.</preCp>
 									</classPath>
 									<downloadUrl>https://jdk.java.net/</downloadUrl>
 									<jre>
diff --git a/client/src/assembly/ctbrec-linux-jre.sh b/client/src/assembly/ctbrec-linux-jre.sh
index e6880968..3a284a4c 100755
--- a/client/src/assembly/ctbrec-linux-jre.sh
+++ b/client/src/assembly/ctbrec-linux-jre.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-pushd $(dirname $0)
+DIR="$(dirname "$0")"
+pushd "${DIR}"
 JAVA=./jre/bin/java
 $JAVA -version
-$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
+$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
 popd
diff --git a/client/src/assembly/ctbrec-linux.sh b/client/src/assembly/ctbrec-linux.sh
index 6ddab21e..4b73212a 100755
--- a/client/src/assembly/ctbrec-linux.sh
+++ b/client/src/assembly/ctbrec-linux.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-pushd $(dirname $0)
+DIR="$(dirname "$0")"
+pushd "${DIR}"
 JAVA=java
 $JAVA -version
-$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
+$JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
 popd
diff --git a/client/src/assembly/ctbrec-macos-jre.sh b/client/src/assembly/ctbrec-macos-jre.sh
index f28903cc..2d857f9f 100755
--- a/client/src/assembly/ctbrec-macos-jre.sh
+++ b/client/src/assembly/ctbrec-macos-jre.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 DIR=$(dirname $0)
-pushd $DIR
+pushd "$DIR"
 JAVA_HOME="$DIR/jre/Contents/Home"
 JAVA="$JAVA_HOME/bin/java"
 $JAVA -version
-$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher
+$JAVA -cp "${DIR}:${name.final}.jar" 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 8de2a9cf..70363914 100755
--- a/client/src/assembly/ctbrec-macos.sh
+++ b/client/src/assembly/ctbrec-macos.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DIR=$(dirname $0)
-pushd $DIR
+pushd "$DIR"
 JAVA=java
 $JAVA -version
-$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher
+$JAVA -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
 popd
\ No newline at end of file
diff --git a/client/src/assembly/ctbrec.bat b/client/src/assembly/ctbrec.bat
new file mode 100644
index 00000000..d3b2eaed
--- /dev/null
+++ b/client/src/assembly/ctbrec.bat
@@ -0,0 +1 @@
+jre\bin\java -Xmx512m -cp ".;${name.final}.jar" ctbrec.ui.Launcher
\ No newline at end of file
diff --git a/client/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
index ecac7150..9213b404 100644
--- a/client/src/assembly/linux-jre.xml
+++ b/client/src/assembly/linux-jre.xml
@@ -24,6 +24,10 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/logback.xml</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 		<file>
 			<source>${project.basedir}/ffmpeg/ffmpeg-linux64</source>
 			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
diff --git a/client/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
index 69a7cc5f..9a38bed1 100644
--- a/client/src/assembly/macos-jre.xml
+++ b/client/src/assembly/macos-jre.xml
@@ -24,6 +24,10 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/logback.xml</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 		<file>
 			<source>${project.basedir}/ffmpeg/ffmpeg-macos64</source>
 			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
index 378f2925..003cd3b9 100644
--- a/client/src/assembly/win64-jre.xml
+++ b/client/src/assembly/win64-jre.xml
@@ -22,6 +22,15 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/logback.xml</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/src/assembly/ctbrec.bat</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+		</file>
 		<file>
 			<source>${project.basedir}/ffmpeg/ffmpeg-win64.exe</source>
 			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
diff --git a/server/src/assembly/server-linux.sh b/server/src/assembly/server-linux.sh
index 59d2ecf8..3eadb7fa 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}/${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
+    $JAVA -Xmx256m -cp "${DIR}:${DIR}/${name.final}.jar" -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 a642bd57..c42ab687 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 ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+$JAVA -Xmx192m -cp "${DIR}:${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 popd
diff --git a/server/src/assembly/server.bat b/server/src/assembly/server.bat
index 62971e63..05d408a7 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 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
\ No newline at end of file
diff --git a/server/src/assembly/server.xml b/server/src/assembly/server.xml
index 7fd4aaef..3d97c507 100644
--- a/server/src/assembly/server.xml
+++ b/server/src/assembly/server.xml
@@ -38,6 +38,10 @@
 			<source>${project.basedir}/src/assembly/ffmpeg.txt</source>
 			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/logback.xml</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 		<file>
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml
index d9bf0230..39d1afc6 100644
--- a/server/src/main/resources/logback.xml
+++ b/server/src/main/resources/logback.xml
@@ -1,4 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
+<configuration scan="true" scanPeriod="10 seconds">
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder