aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/download-latest-save.bash14
-rw-r--r--util/upload-save.bash10
2 files changed, 19 insertions, 5 deletions
diff --git a/util/download-latest-save.bash b/util/download-latest-save.bash
index 2a84660..c1d0f0d 100644
--- a/util/download-latest-save.bash
+++ b/util/download-latest-save.bash
@@ -7,12 +7,20 @@ if [ $# -ne 1 ]; then
fi
remote_name="$1"
+key_path=""
+
+# Check if custom PEM file is provided
+if [ -n "$FACTORIO_PEM" ]; then
+ key_path="-i $FACTORIO_PEM"
+fi
# Generate a human-readable timestamp
timestamp=$(date +"%Y-%m-%d_%H-%M-%S")
+
+
# SSH into the remote instance to find the most recent save file
-ssh_output=$(ssh "ec2-user@$remote_name" << EOF
+ssh_output=$(ssh $key_path "ec2-user@$remote_name" << EOF
# Record the current directory
current_dir=\$(pwd)
@@ -59,9 +67,9 @@ latest_file=$(basename "$latest_file_path")
# Download the file from the remote instance to the current local directory with the new filename
new_filename="${remote_name}_${timestamp}_${latest_file}"
-scp "ec2-user@$remote_name:$latest_file_path" "./$new_filename"
+scp $key_path "ec2-user@$remote_name:$latest_file_path" "./$new_filename"
# Clean up the temporary file on the remote instance
-ssh "ec2-user@$remote_name" "rm -f $latest_file_path"
+ssh $key_path "ec2-user@$remote_name" "rm -f $latest_file_path"
echo "Download complete. The latest save file has been saved as '$new_filename' in your current directory." \ No newline at end of file
diff --git a/util/upload-save.bash b/util/upload-save.bash
index 9c66030..4cd55e8 100644
--- a/util/upload-save.bash
+++ b/util/upload-save.bash
@@ -9,6 +9,12 @@ fi
# Get the file path and EC2 address from command line arguments
save_file="$1"
ec2_address="$2"
+key_path=""
+
+# Check if custom PEM file is provided
+if [ -n "$FACTORIO_PEM" ]; then
+ key_path="-i $FACTORIO_PEM"
+fi
# Check if the file exists
if [ ! -f "$save_file" ]; then
@@ -18,10 +24,10 @@ fi
# Upload the save file to the EC2 instance
echo "Uploading save file to EC2 instance..."
-scp "$save_file" "ec2-user@$ec2_address:~/"
+scp $key_path "$save_file" "ec2-user@$ec2_address:~/"
# SSH into the EC2 instance and perform the required operations
-ssh "ec2-user@$ec2_address" << EOF
+ssh $key_path "ec2-user@$ec2_address" << EOF
# Get the Factorio container ID
container_id=\$(docker ps | grep factoriotools/factorio | awk '{print \$1}' | cut -c1-3)
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage