From 705cba7d440b0b8c5e1c11dce45999d0f752c5cd Mon Sep 17 00:00:00 2001 From: TheSp1der Date: Wed, 30 Oct 2019 21:37:24 -0500 Subject: [PATCH] more escaping --- build-factario-container.jenkins | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-factario-container.jenkins b/build-factario-container.jenkins index 32df3d7..fa10be2 100644 --- a/build-factario-container.jenkins +++ b/build-factario-container.jenkins @@ -78,10 +78,10 @@ RUN \\ "set -e" \\ "id" \\ "mkdir -p /factorio \${SAVES} \${CONFIG} \${MODS} \${SCENARIOS} \${SCRIPT_OUTPUT}" \\ - "[ ! -f \"\${CONFIG}/rconpw\" ] && printf '%s' \"\$(pwgen 15 1)\" > \${CONFIG}/rconpw" \\ - "[ ! -f \"\${CONFIG}/server-settings.json\" ] && cp /opt/factorio/data/server-settings.example.json \${CONFIG}/server-settings.json" \\ - "[ ! -f \"\${CONFIG}/map-gen-settings.json\" ] && cp /opt/factorio/data/map-gen-settings.example.json \${CONFIG}/map-gen-settings.json" \\ - "[ ! -f \"\${CONFIG}/map-settings.json\" ] && cp /opt/factorio/data/map-settings.example.json \${CONFIG}/map-settings.json" \\ + "[ ! -f \\\"\${CONFIG}/rconpw\\\" ] && printf '%s' \"\$(pwgen 15 1)\" > \${CONFIG}/rconpw" \\ + "[ ! -f \\\"\${CONFIG}/server-settings.json\\\" ] && cp /opt/factorio/data/server-settings.example.json \${CONFIG}/server-settings.json" \\ + "[ ! -f \\\"\${CONFIG}/map-gen-settings.json\\\" ] && cp /opt/factorio/data/map-gen-settings.example.json \${CONFIG}/map-gen-settings.json" \\ + "[ ! -f \\\"\${CONFIG}/map-settings.json\\\" ] && cp /opt/factorio/data/map-settings.example.json \${CONFIG}/map-settings.json" \\ "find -L \${SAVES} -iname \\*.tmp.zip -mindepth 1 -print | grep -q .; then rm -f \${SAVES}/*.tmp.zip" \\ "if ! find -L \${SAVES} -iname \\*.tmp.zip -mindepth 1 -print | grep -q .; then" \\ " /opt/factorio/bin/x64/factorio \\\" \\ @@ -98,7 +98,7 @@ RUN \\ " --server-whitelist \${CONFIG}/server-whitelist.json \\\" \\ " --use-server-whitelist \\\" \\ " --server-adminlist \${CONFIG}/server-adminlist.json \\\" \\ - " --rcon-password \"\$(cat \${CONFIG}/rconpw)\" \\\" \\ + " --rcon-password \\\"\$(cat \${CONFIG}/rconpw)\\\" \\\" \\ " --server-id /factorio/config/server-id.json \\\" \\ " \${@}" > start-server.sh && \\ chmod +x ./start-server.sh