update to 0.17.38

Fixed naming of `$SCENARIOS`

0.16/files/scenario.sh

@@ -2,7 +2,7 @@
 if [ -z "$1" ]; then
   echo "No argument supplied"
 fi
-SCENARIO=$1
+SERVER_SCENARIO=$1
 
 set -euo pipefail
 
@@ -11,7 +11,7 @@ id
 mkdir -p "$SAVES"
 mkdir -p "$CONFIG"
 mkdir -p "$MODS"
-mkdir -p "$SCENARIO"
+mkdir -p "$SCENARIOS"
 
 #chown -R factorio /factorio
 
@@ -33,7 +33,7 @@ fi
 
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
-  --start-server-load-scenario "$SCENARIO" \
+  --start-server-load-scenario "$SERVER_SCENARIO" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \
   --server-banlist "$CONFIG/server-banlist.json" \

0.16/files/scenario2map.sh

@@ -2,7 +2,7 @@
 if [ -z "$1" ]; then
   echo "No argument supplied"
 fi
-SCENARIO=$1
+SERVER_SCENARIO=$1
 
 set -euo pipefail
 
@@ -11,7 +11,7 @@ id
 mkdir -p "$SAVES"
 mkdir -p "$CONFIG"
 mkdir -p "$MODS"
-mkdir -p "$SCENARIO"
+mkdir -p "$SCENARIOS"
 
 if [ ! -f "$CONFIG/server-settings.json" ]; then
   cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
@@ -26,4 +26,4 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
 fi
 
 exec /opt/factorio/bin/x64/factorio \
-  --scenario2map "$SCENARIO"
+  --scenario2map "$SERVER_SCENARIO"

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.36 \
-    SHA1=9ed258f4f27852e227ca5eac755c29874450f118 \
+    VERSION=0.17.38 \
+    SHA1=c77f9858984213718318b3a4edc028be80274cf8 \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \

0.17/files/docker-entrypoint.sh

@@ -29,7 +29,8 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
   cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
 fi
 
-if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
+NRTMPSAVES=$( find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 | wc -l )
+if [ $NRTMPSAVES -gt 0 ]; then
   # Delete incomplete saves (such as after a forced exit)
   rm -f "$SAVES/*.tmp.zip"
 fi
@@ -46,7 +47,8 @@ else
   SU_EXEC=""
 fi
 
-if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
+NRSAVES=$( find -L "$SAVES" -iname \*.zip -mindepth 1 | wc -l )
+if [ $NRSAVES -eq 0 ]; then
   # Generate a new map if no save ZIPs exist
   $SU_EXEC /opt/factorio/bin/x64/factorio \
     --create "$SAVES/_autosave1.zip" \

0.17/files/scenario.sh

@@ -2,7 +2,7 @@
 if [ -z "$1" ]; then
   echo "No argument supplied"
 fi
-SCENARIO="$1"
+SERVER_SCENARIO="$1"
 
 set -euo pipefail
 
@@ -11,7 +11,7 @@ id
 mkdir -p "$SAVES"
 mkdir -p "$CONFIG"
 mkdir -p "$MODS"
-mkdir -p "$SCENARIO"
+mkdir -p "$SCENARIOS"
 
 #chown -R factorio /factorio
 
@@ -33,7 +33,7 @@ fi
 
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
-  --start-server-load-scenario "$SCENARIO" \
+  --start-server-load-scenario "$SERVER_SCENARIO" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \
   --server-banlist "$CONFIG/server-banlist.json" \

0.17/files/scenario2map.sh

@@ -2,7 +2,7 @@
 if [ -z "$1" ]; then
   echo "No argument supplied"
 fi
-SCENARIO="$1"
+SERVER_SCENARIO="$1"
 
 set -euo pipefail
 
@@ -11,7 +11,7 @@ id
 mkdir -p "$SAVES"
 mkdir -p "$CONFIG"
 mkdir -p "$MODS"
-mkdir -p "$SCENARIO"
+mkdir -p "$SCENARIOS"
 
 if [ ! -f "$CONFIG/server-settings.json" ]; then
   cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
@@ -26,4 +26,4 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
 fi
 
 exec /opt/factorio/bin/x64/factorio \
-  --scenario2map "$SCENARIO"
+  --scenario2map "$SERVER_SCENARIO"

README.md

@@ -1,6 +1,6 @@
 # Factorio [![](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/)
 
-* `0.17.36`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
+* `0.17.38`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
 * `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
 * `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
 * `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.14/Dockerfile)