From fe8f611eca1e1b77ae05e0fabafdfb443854250f Mon Sep 17 00:00:00 2001 From: Jafea7 Date: Mon, 7 Apr 2025 14:29:08 +1000 Subject: [PATCH] Change config dir to ./config --- client/src/assembly/ctbrec-linux-jre-no-splash.sh | 2 +- client/src/assembly/ctbrec-linux-jre.sh | 2 +- client/src/assembly/ctbrec-macos-jre-no-splash.sh | 2 +- client/src/assembly/ctbrec-macos-jre.sh | 2 +- client/src/assembly/ctbrec.bat | 2 +- client/src/assembly/ctbrec.l4j.ini | 1 + client/src/assembly/win64-jre.xml | 4 ++++ 7 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 client/src/assembly/ctbrec.l4j.ini diff --git a/client/src/assembly/ctbrec-linux-jre-no-splash.sh b/client/src/assembly/ctbrec-linux-jre-no-splash.sh index 21067e3f..65a54373 100755 --- a/client/src/assembly/ctbrec-linux-jre-no-splash.sh +++ b/client/src/assembly/ctbrec-linux-jre-no-splash.sh @@ -4,5 +4,5 @@ DIR="$(dirname "$0")" pushd "${DIR}" JAVA=./jre/bin/java $JAVA -version -$JAVA -Xmx1g -Djdk.gtk.version=3 -Dfile.encoding=utf-8 -jar ${name.final}.jar +$JAVA -Xmx1g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar popd diff --git a/client/src/assembly/ctbrec-linux-jre.sh b/client/src/assembly/ctbrec-linux-jre.sh index 294ea60d..c2a9d830 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 -splash:splash.png -Xmx1g -Djdk.gtk.version=3 -Dfile.encoding=utf-8 -jar ${name.final}.jar +$JAVA -splash:splash.png -Xmx1g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar popd diff --git a/client/src/assembly/ctbrec-macos-jre-no-splash.sh b/client/src/assembly/ctbrec-macos-jre-no-splash.sh index eb23e7a6..d65d10c4 100755 --- a/client/src/assembly/ctbrec-macos-jre-no-splash.sh +++ b/client/src/assembly/ctbrec-macos-jre-no-splash.sh @@ -5,5 +5,5 @@ pushd "$DIR" JAVA_HOME="$DIR/jre/Contents/Home" JAVA="$JAVA_HOME/bin/java" $JAVA -version -$JAVA -Xmx1g -Dfile.encoding=utf-8 -jar ${name.final}.jar +$JAVA -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar popd diff --git a/client/src/assembly/ctbrec-macos-jre.sh b/client/src/assembly/ctbrec-macos-jre.sh index 04194027..c371ed10 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 -splash:splash.png -Xmx1g -Dfile.encoding=utf-8 -jar ${name.final}.jar +$JAVA -splash:splash.png -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar popd diff --git a/client/src/assembly/ctbrec.bat b/client/src/assembly/ctbrec.bat index 65ce3151..bb5d1c9c 100644 --- a/client/src/assembly/ctbrec.bat +++ b/client/src/assembly/ctbrec.bat @@ -1 +1 @@ -jre\bin\java -Xmx1g -Dfile.encoding=utf-8 -jar ${name.final}.jar +jre\bin\java -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar diff --git a/client/src/assembly/ctbrec.l4j.ini b/client/src/assembly/ctbrec.l4j.ini new file mode 100644 index 00000000..50a21f00 --- /dev/null +++ b/client/src/assembly/ctbrec.l4j.ini @@ -0,0 +1 @@ +-Dctbrec.config.dir=./config \ No newline at end of file diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml index 0f85f278..edb9eb72 100644 --- a/client/src/assembly/win64-jre.xml +++ b/client/src/assembly/win64-jre.xml @@ -45,6 +45,10 @@ ctbrec/lib/ffmpeg ffmpeg.exe + + ${project.basedir}/src/assembly/ctbrec.l4j.ini + ctbrec +