Quote all vars, remove useless echo/sub-shell, add shebands, fail on unset vars, enable pipefail, formatting

0.16/files/docker-entrypoint.sh

@@ -1,48 +1,48 @@
 #!/bin/sh -x
-set -e
+set -euo pipefail
 
 id
 
-mkdir -p $SAVES
-mkdir -p $CONFIG
-mkdir -p $MODS
-mkdir -p $SCENARIOS
-mkdir -p $SCRIPTOUTPUT
+mkdir -p "$SAVES"
+mkdir -p "$CONFIG"
+mkdir -p "$MODS"
+mkdir -p "$SCENARIOS"
+mkdir -p "$SCRIPTOUTPUT"
 
-if [ ! -f $CONFIG/rconpw ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
+if [ ! -f "$CONFIG/rconpw" ]; then
+  pwgen 15 1>"$CONFIG/rconpw"
 fi
 
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
+if [ ! -f "$CONFIG/server-settings.json" ]; then
+  cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
+if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
+  cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-settings.json ]; then
-  cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
+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
-  rm -f $SAVES/*.tmp.zip
+if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
+  rm -f "$SAVES/*.tmp.zip"
 fi
 
-if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
   /opt/factorio/bin/x64/factorio \
-    --create $SAVES/_autosave1.zip  \
-    --map-gen-settings $CONFIG/map-gen-settings.json \
-    --map-settings $CONFIG/map-settings.json
+    --create "$SAVES/_autosave1.zip" \
+    --map-gen-settings "$CONFIG/map-gen-settings.json" \
+    --map-settings "$CONFIG/map-settings.json"
 fi
 
 exec /opt/factorio/bin/x64/factorio \
-  --port $PORT \
+  --port "$PORT" \
   --start-server-load-latest \
-  --server-settings $CONFIG/server-settings.json \
-  --server-whitelist $CONFIG/server-whitelist.json \
-  --server-banlist $CONFIG/server-banlist.json \
-  --rcon-port $RCON_PORT \
-  --rcon-password "$(cat $CONFIG/rconpw)" \
+  --server-settings "$CONFIG/server-settings.json" \
+  --server-whitelist "$CONFIG/server-whitelist.json" \
+  --server-banlist "$CONFIG/server-banlist.json" \
+  --rcon-port "$RCON_PORT" \
+  --rcon-password "$(cat "$CONFIG/rconpw")" \
   --server-id /factorio/config/server-id.json \
-  $@
+  "$@"

0.16/files/scenario.sh

@@ -1,44 +1,42 @@
 #!/bin/sh -x
-if [ -z "$1" ]
-  then
-    echo "No argument supplied"
+if [ -z "$1" ]; then
+  echo "No argument supplied"
 fi
 SCENARIO=$1
 
-set -e
+set -euo pipefail
 
 id
 
-mkdir -p $SAVES
-mkdir -p $CONFIG
-mkdir -p $MODS
-mkdir -p $SCENARIOS
+mkdir -p "$SAVES"
+mkdir -p "$CONFIG"
+mkdir -p "$MODS"
+mkdir -p "$SCENARIO"
 
 #chown -R factorio /factorio
 
-if [ ! -f $CONFIG/rconpw ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
+if [ ! -f "$CONFIG/rconpw" ]; then
+  pwgen 15 1 >"$CONFIG/rconpw"
 fi
 
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
+if [ ! -f "$CONFIG/server-settings.json" ]; then
+  cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
+if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
+  cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-settings.json ]; then
-  cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
+if [ ! -f "$CONFIG/map-settings.json" ]; then
+  cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
 fi
 
-
 exec /opt/factorio/bin/x64/factorio \
-  --port $PORT \
-  --start-server-load-scenario $SCENARIO \
-  --server-settings $CONFIG/server-settings.json \
-  --server-whitelist $CONFIG/server-whitelist.json \
-  --server-banlist $CONFIG/server-banlist.json \
-  --rcon-port $RCON_PORT \
-  --rcon-password "$(cat $CONFIG/rconpw)" \
+  --port "$PORT" \
+  --start-server-load-scenario "$SCENARIO" \
+  --server-settings "$CONFIG/server-settings.json" \
+  --server-whitelist "$CONFIG/server-whitelist.json" \
+  --server-banlist "$CONFIG/server-banlist.json" \
+  --rcon-port "$RCON_PORT" \
+  --rcon-password "$(cat "$CONFIG/rconpw")" \
   --server-id /factorio/config/server-id.json

0.16/files/scenario2map.sh

@@ -1,30 +1,29 @@
 #!/bin/sh -x
-if [ -z "$1" ]
-  then
-    echo "No argument supplied"
+if [ -z "$1" ]; then
+  echo "No argument supplied"
 fi
 SCENARIO=$1
 
-set -e
+set -euo pipefail
 
 id
 
-mkdir -p $SAVES
-mkdir -p $CONFIG
-mkdir -p $MODS
-mkdir -p $SCENARIOS
+mkdir -p "$SAVES"
+mkdir -p "$CONFIG"
+mkdir -p "$MODS"
+mkdir -p "$SCENARIO"
 
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
+if [ ! -f "$CONFIG/server-settings.json" ]; then
+  cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
+if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
+  cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
 fi
 
-if [ ! -f $CONFIG/map-settings.json ]; then
-  cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
+if [ ! -f "$CONFIG/map-settings.json" ]; then
+  cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
 fi
 
 exec /opt/factorio/bin/x64/factorio \
-  --scenario2map $SCENARIO
+  --scenario2map "$SCENARIO"