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

This commit is contained in:
Sandro Jäckel
2019-03-30 19:31:03 +01:00
parent 6d92825f56
commit 46f24b0b7a
11 changed files with 172 additions and 175 deletions

View File

@ -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
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"