From aef16e83a79c7bbd6e8abc22465a0fdd1e7dee69 Mon Sep 17 00:00:00 2001
From: Brandon Houghton <bhoughton@cmu.edu>
Date: Thu, 2 May 2019 12:07:38 -0400
Subject: [PATCH] Fixed naming of `$SCENARIOS` Renamed local variable
 `$SCENARIO` to `$SERVER_SCENARIO`

---
 0.16/files/scenario.sh     | 6 +++---
 0.16/files/scenario2map.sh | 6 +++---
 0.17/files/scenario.sh     | 6 +++---
 0.17/files/scenario2map.sh | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/0.16/files/scenario.sh b/0.16/files/scenario.sh
index 634c6bf..d10b91c 100755
--- a/0.16/files/scenario.sh
+++ b/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" \
diff --git a/0.16/files/scenario2map.sh b/0.16/files/scenario2map.sh
index 8260276..30d96af 100755
--- a/0.16/files/scenario2map.sh
+++ b/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"
diff --git a/0.17/files/scenario.sh b/0.17/files/scenario.sh
index c8cfe58..5b4b32c 100755
--- a/0.17/files/scenario.sh
+++ b/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" \
diff --git a/0.17/files/scenario2map.sh b/0.17/files/scenario2map.sh
index 63b09d5..57a3d62 100755
--- a/0.17/files/scenario2map.sh
+++ b/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"