From b0ebc46c0a41f907ab1b30156139cd52ddbb7eb2 Mon Sep 17 00:00:00 2001
From: Alex <agreenland@cromwells.co.uk>
Date: Wed, 28 Oct 2020 18:16:49 +0000
Subject: [PATCH] Fix ftp and filename issues in upload script

The uploadForDay script had the following issues

1) Does not include the ftp settings so could never connect
2) The file extension was hard coded to .jpg
---
 scripts/uploadForDay.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/uploadForDay.sh b/scripts/uploadForDay.sh
index a26c3f106..c5256f559 100755
--- a/scripts/uploadForDay.sh
+++ b/scripts/uploadForDay.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 source $ALLSKY_HOME/config.sh
 source $ALLSKY_HOME/scripts/filename.sh
+source $ALLSKY_HOME/scripts/ftp-settings.sh
 
 cd  $ALLSKY_HOME/scripts
 
@@ -17,13 +18,13 @@ fi
 
 # Upload keogram
 echo -e "Uploading Keogram\n"
-KEOGRAM="$ALLSKY_HOME/images/$1/keogram/keogram-$1.jpg"
+KEOGRAM="$ALLSKY_HOME/images/$1/keogram/keogram-$1.$EXTENSION"
 lftp "$PROTOCOL"://"$USER":"$PASSWORD"@"$HOST":"$KEOGRAM_DIR" -e "set net:max-retries 1; put $KEOGRAM; bye" -u "$USER","$PASSWORD"
 echo -e "\n"
 
 # Upload Startrails
 echo -e "Uploading Startrails\n"
-STARTRAILS="$ALLSKY_HOME/images/$1/startrails/startrails-$1.jpg"
+STARTRAILS="$ALLSKY_HOME/images/$1/startrails/startrails-$1.$EXTENSION"
 lftp "$PROTOCOL"://"$USER":"$PASSWORD"@"$HOST":"$STARTRAILS_DIR" -e "set net:max-retries 1; put $STARTRAILS; bye"
 echo -e "\n"