Truly fix mod updates with spaces in names (#320)

0.17/Dockerfile

@@ -31,6 +31,7 @@ RUN set -ox pipefail \
     && chmod ugo=rwx /opt/factorio \
     && rm "$archive" \
     && ln -s "$SCENARIOS" /opt/factorio/scenarios \
+    && ln -s "$SAVES" /opt/factorio/saves \
     && mkdir -p /opt/factorio/config/ \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \

0.17/files/scenario.sh

@@ -32,6 +32,8 @@ fi
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
   --start-server-load-scenario "$SERVER_SCENARIO" \
+  --map-gen-settings "$CONFIG/map-gen-settings.json" \
+  --map-settings "$CONFIG/map-settings.json" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-banlist "$CONFIG/server-banlist.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \

0.17/files/update-mods.sh

@@ -25,11 +25,12 @@ print_failure()
 
 update_mod()
 {
-  MOD_NAME="${1// /%20}"
+  MOD_NAME="$1"
+  MOD_NAME_ENCODED="${1// /%20}"
 
   print_step "Checking for update of mod $MOD_NAME..."
 
-  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
+  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME_ENCODED"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
   if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then

0.18/Dockerfile

@@ -31,6 +31,7 @@ RUN set -ox pipefail \
     && chmod ugo=rwx /opt/factorio \
     && rm "$archive" \
     && ln -s "$SCENARIOS" /opt/factorio/scenarios \
+    && ln -s "$SAVES" /opt/factorio/saves \
     && mkdir -p /opt/factorio/config/ \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \

0.18/files/scenario.sh

@@ -32,6 +32,8 @@ fi
 exec /opt/factorio/bin/x64/factorio \
   --port "$PORT" \
   --start-server-load-scenario "$SERVER_SCENARIO" \
+  --map-gen-settings "$CONFIG/map-gen-settings.json" \
+  --map-settings "$CONFIG/map-settings.json" \
   --server-settings "$CONFIG/server-settings.json" \
   --server-banlist "$CONFIG/server-banlist.json" \
   --server-whitelist "$CONFIG/server-whitelist.json" \

0.18/files/update-mods.sh

@@ -25,11 +25,12 @@ print_failure()
 
 update_mod()
 {
-  MOD_NAME="${1// /%20}"
+  MOD_NAME="$1"
+  MOD_NAME_ENCODED="${1// /%20}"
 
   print_step "Checking for update of mod $MOD_NAME..."
 
-  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
+  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME_ENCODED"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
   if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then