From 216c660cd1a1fcbd189880548c33f7846542698e Mon Sep 17 00:00:00 2001
From: Isaac Hill <eesocktmendez@gmail.com>
Date: Sun, 3 Nov 2024 17:01:51 -0800
Subject: Use bash variable rather than optional argument for ssh key path

---
 readme.md                      | 12 ++++++++++++
 util/download-latest-save.bash | 10 +++++-----
 util/upload-save.bash          | 10 +++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index 9231797..e5a69de 100644
--- a/readme.md
+++ b/readme.md
@@ -69,6 +69,12 @@ Use the automation in `util/upload-save.bash` to upload your save file to your s
 bash util/upload-save.bash ~/path/to/my/save.zip $your_ec2_ip_or_remote_name
 ```
 
+Optionally, you can specify a path to a private key with a bash variable rather than relying on default ssh keys.
+
+``` bash
+FACTORIO_PEM=~/path/to/my.pem bash util/upload-save.bash ~/path/to/my/save.zip $your_ec2_ip_or_remote_name
+```
+
 This is just an automated implementation of the slower version below.
 
 ##### Fast save download (Recommended)
@@ -79,6 +85,12 @@ Use the automation in `util/download-latest-save.bash` to download the latest (m
 bash util/download-latest-save.bash $your_ec2_ip_or_remote_name
 ```
 
+Optionally, you can specify a path to a private key with a bash variable rather than relying on default ssh keys.
+
+``` bash
+FACTORIO_PEM=~/path/to/my.pem bash util/download-latest-save.bash $your_ec2_ip_or_remote_name
+```
+
 Your server needs to be running for this to work and it should download your latest save to your local directory.
 
 ##### Manual upload process (for understanding the system)
diff --git a/util/download-latest-save.bash b/util/download-latest-save.bash
index 2ab5c62..c1d0f0d 100644
--- a/util/download-latest-save.bash
+++ b/util/download-latest-save.bash
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 # Check if remote name is provided
-if [ $# -ne 1 -a $# -ne 2 ]; then
-    echo "Usage: $0 <remote_name> [optional_path_to_MyKey.pem]"
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <remote_name>"
     exit 1
 fi
 
 remote_name="$1"
 key_path=""
 
-# Check if remote name is provided
-if [ $# -eq 2 ]; then
-    key_path="-i $2"
+# Check if custom PEM file is provided
+if [ -n "$FACTORIO_PEM" ]; then
+    key_path="-i $FACTORIO_PEM"
 fi
 
 # Generate a human-readable timestamp
diff --git a/util/upload-save.bash b/util/upload-save.bash
index d8a109f..4cd55e8 100644
--- a/util/upload-save.bash
+++ b/util/upload-save.bash
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Check if both arguments are provided
-if [ $# -ne 2 -a $# -ne 3 ]; then
-    echo "Usage: $0 <path_to_MySave.zip> <ec2_address> [optional_path_to_MyKey.pem]"
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <path_to_MySave.zip> <ec2_address>"
     exit 1
 fi
 
@@ -11,9 +11,9 @@ save_file="$1"
 ec2_address="$2"
 key_path=""
 
-# Check if remote name is provided
-if [ $# -eq 3 ]; then
-    key_path="-i $3"
+# Check if custom PEM file is provided
+if [ -n "$FACTORIO_PEM" ]; then
+    key_path="-i $FACTORIO_PEM"
 fi
 
 # Check if the file exists
-- 
cgit v1.2.3