From e5b4dba7287905bb86b158cc07c3ff6e2785c8b5 Mon Sep 17 00:00:00 2001
From: TheSp1der <nhyatt@smoothnet.org>
Date: Wed, 30 Oct 2019 21:28:07 -0500
Subject: [PATCH] .

---
 build-factario-container.jenkins | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/build-factario-container.jenkins b/build-factario-container.jenkins
index da6eb68..ee8688d 100644
--- a/build-factario-container.jenkins
+++ b/build-factario-container.jenkins
@@ -84,20 +84,23 @@ RUN \\
 		"[ ! -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 \\" \\
-		"		--create \${SAVES}/_autosave1.zip \\" \\
-		"		--map-gen-settings \${CONFIG}/map-gen-settings.json \\" \\
+		"	/opt/factorio/bin/x64/factorio \\\" \\
+		"		--create \${SAVES}/_autosave1.zip \\\" \\
+		"		--map-gen-settings \${CONFIG}/map-gen-settings.json \\\" \\
 		"		--map-settings \${CONFIG}/map-settings.json" \\
 		"fi" \\
 		"/opt/factorio/bin/x64/factorio \\" \\
-		"	--port \${PORT} \\" \\
-		"	--start-server-load-latest \\" \\
-		"	--server-settings \${CONFIG}/server-settings.json \\" \\
-		"	--server-banlist \${CONFIG}/server-banlist.json \\" \\
-		"	--rcon-port \${RCON_PORT} \\" \\
-		"	--server-whitelist \${CONFIG}/server-whitelist.json \\" \\
-		"	--use-server-whitelist \\" \\
-		"	--server-adminlist \${CONFIG}/server-adminlist.json \\"
+		"	--port \${PORT} \\\" \\
+		"	--start-server-load-latest \\\" \\
+		"	--server-settings \${CONFIG}/server-settings.json \\\" \\
+		"	--server-banlist \${CONFIG}/server-banlist.json \\\" \\
+		"	--rcon-port \${RCON_PORT} \\\" \\
+		"	--server-whitelist \${CONFIG}/server-whitelist.json \\\" \\
+		"	--use-server-whitelist \\\" \\
+		"	--server-adminlist \${CONFIG}/server-adminlist.json \\\"
+		"	--rcon-password \"\$(cat \${CONFIG}/rconpw)\" \\\" \\
+		"	--server-id /factorio/config/server-id.json \\\" \\
+		"	$@"
 """
 
 podTemplate(