From 26aec7cef47b5bf3d3cb1e5da280c9f83c414d99 Mon Sep 17 00:00:00 2001 From: OMGeeky <> Date: Tue, 18 Feb 2025 22:33:08 +0100 Subject: [PATCH] Fix some issues with the linux ATCS.sh when the current path has spaces etc. --- packaging/common/ATCS.sh | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/packaging/common/ATCS.sh b/packaging/common/ATCS.sh index 41d78b2..21bcfbf 100755 --- a/packaging/common/ATCS.sh +++ b/packaging/common/ATCS.sh @@ -1,21 +1,26 @@ #!/bin/bash -ATCS_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")) +ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")" +echo "ATCS_DIR: '${ATCS_DIR}'" -MAX_MEM=512M - -JAVA=java +MAX_MEM="512M" +JAVA="java" JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true' -ENV_FILE=${ATCS_DIR}/ATCS.env -if [ -f ${ENV_FILE} ]; then - source ${ENV_FILE} +ENV_FILE="${ATCS_DIR}/ATCS.env" + +if [ -f "${ENV_FILE}" ]; then + source "${ENV_FILE}" else - echo "#MAX_MEM=${MAX_MEM}" >${ENV_FILE} - echo "#JAVA=${JAVA}" >>${ENV_FILE} - echo "#JAVA_OPTS=${JAVA_OPTS}" >>${ENV_FILE} - echo "" >>${ENV_FILE} + { + echo "#MAX_MEM=\"${MAX_MEM}\"" + echo "#JAVA=\"${JAVA}\"" + echo "#JAVA_OPTS=\"${JAVA_OPTS}\"" + echo "" + }>"${ENV_FILE}" fi export ENV_FILE - -$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar ${ATCS_DIR}/ATCS.jar +exit 1 +# shellcheck disable=SC2086 +# (spellchecker is disabled for this line, because we want it to be split into multiple arguments) +$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar "${ATCS_DIR}/ATCS.jar"