From 98f0b36cfccc3553fd3adcbbe1d382a2a5387391 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 1 Apr 2020 18:50:07 -0500 Subject: [PATCH] Changed FTB exec to always use shell For #469 --- start-minecraftFinalSetup | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 9d2aa093..7badb723 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -99,6 +99,8 @@ fi mcServerRunnerArgs="--stop-duration 60s" if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then + mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash" + if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then cp -f /data/ops.txt ${FTB_DIR}/ fi @@ -119,10 +121,6 @@ EOF if [ -f "${FTB_DIR}/settings.cfg" ]; then sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg" fi - # if missing shebang line, then run file through bash - if ! head -1 "${FTB_SERVER_START}"|grep -q "^#!"; then - mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash" - fi cd "${FTB_DIR}" log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."