From 44a4aa656d7f452fb74df07e15bae26c068bedf4 Mon Sep 17 00:00:00 2001 From: Leonid Pershin Date: Sat, 9 May 2026 15:16:05 +0300 Subject: [PATCH] Enhance logging in install-service.sh for Minecraft server launch by adding a prefix for easier identification in logs, improving visibility of Java command and arguments, and ensuring consistent output formatting. --- Server/install-service.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Server/install-service.sh b/Server/install-service.sh index 152f76c..252929f 100644 --- a/Server/install-service.sh +++ b/Server/install-service.sh @@ -197,25 +197,27 @@ if [[ -s "./variables.txt" ]]; then fi GAME_ARGS_REL="${NEOFORGE_ARGS_REL}" +# Префикс для journalctl | grep, например: journalctl -u minecraft -b | grep '[mc-launch]' +_MC_LP='[mc-launch]' -echo "==== Minecraft server launch (systemd / run-service.sh) ====" +echo "\${_MC_LP} ========== Minecraft server (systemd / run-service.sh) ==========" _JAVA_CMD="\${JAVA:-java}" if command -v "\$_JAVA_CMD" >/dev/null 2>&1; then - echo "Java: \$(command -v "\$_JAVA_CMD")" + echo "\${_MC_LP} Java: \$(command -v "\$_JAVA_CMD")" else - echo "Java: \$_JAVA_CMD" + echo "\${_MC_LP} Java: \$_JAVA_CMD" fi -echo "ADDITIONAL_ARGS: \${ADDITIONAL_ARGS:-}" -echo "JVM args (user_jvm_args.txt):" +echo "\${_MC_LP} ADDITIONAL_ARGS: \${ADDITIONAL_ARGS:-}" +echo "\${_MC_LP} JVM args (user_jvm_args.txt):" if [[ -f user_jvm_args.txt ]]; then - grep -v '^[[:space:]]*#' user_jvm_args.txt | grep -v '^[[:space:]]*$' || true + grep -v '^[[:space:]]*#' user_jvm_args.txt | grep -v '^[[:space:]]*$' | sed "s/^/\${_MC_LP} /" || true else - echo " (user_jvm_args.txt not found)" + echo "\${_MC_LP} (user_jvm_args.txt not found)" fi -echo "Game/program args file: @\${GAME_ARGS_REL}" -echo "Trailing args: \$*" -echo "Java invocation pattern: \$_JAVA_CMD \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @\${GAME_ARGS_REL} \$*" -echo "===========================================================" +echo "\${_MC_LP} Game/program args file: @\${GAME_ARGS_REL}" +echo "\${_MC_LP} Trailing args: \$*" +echo "\${_MC_LP} Java invocation pattern: \$_JAVA_CMD \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @\${GAME_ARGS_REL} \$*" +echo "\${_MC_LP} ==============================================================" # shellcheck disable=SC2086 exec "\${JAVA:-java}" \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @"${NEOFORGE_ARGS_REL}" "\$@"