From fca9b9d351130ceda830b1ffb6f861785984957e Mon Sep 17 00:00:00 2001 From: dginovker Date: Mon, 30 Oct 2023 19:11:49 +0900 Subject: [PATCH] Allow passing path to custom Java executable --- launch.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/launch.sh b/launch.sh index af41a07..f242a1c 100755 --- a/launch.sh +++ b/launch.sh @@ -1,9 +1,15 @@ #!/usr/bin/env bash +# Usage: ./script.sh [path_to_java] +# If path_to_java is not provided, the script will use the default java command. + export _JAVA_OPTIONS= SCRIPT_DIR=$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P) FIRST_RUN=1 +# Use the provided java command or fall back to the default +JAVA_CMD=${1:-java} + lsof -i:43595 if [ $? -ne 1 ]; then @@ -21,7 +27,7 @@ else fi cd $SCRIPT_DIR/game -java -jar -Xmx2G -Xms2G -jar server.jar & +$JAVA_CMD -jar -Xmx2G -Xms2G -jar server.jar & SERVER_PID=$! lsof -i:43595 > /dev/null @@ -35,8 +41,7 @@ while [ $? -eq "1" ]; do done; sleep 2 -java -Xmx1G -Xms1G -jar client.jar +$JAVA_CMD -Xmx1G -Xms1G -jar client.jar kill $SERVER_PID exit -