mirror/factorio-docker
1
0
Fork 0
mirror of https://github.com/factoriotools/factorio-docker.git synced 2024-11-07 11:17:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed naming of $SCENARIOS (#242)

Browse Source 
Fixed naming of `$SCENARIOS`
This commit is contained in:
Sandro Jäckel 2019-05-04 16:18:06 +02:00 committed by GitHub
commit 621ccf4282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0.16/files/scenario.sh
View File

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

6
0.16/files/scenario2map.sh
View File

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

6
0.17/files/scenario.sh
View File

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

6
0.17/files/scenario2map.sh
View File

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