From 7bbaf802dd404046e30c3a7650d1484240159163 Mon Sep 17 00:00:00 2001 From: EricClaeys <83164203+EricClaeys@users.noreply.github.com> Date: Mon, 4 Oct 2021 13:20:41 -0500 Subject: [PATCH 1/3] postData.sh: fix IMG_DIR bug IMG_DIR is the new name that isn't implemented yet. IMGDIR is the old name. --- scripts/postData.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/postData.sh b/scripts/postData.sh index d55af756f..dd53789b9 100755 --- a/scripts/postData.sh +++ b/scripts/postData.sh @@ -32,4 +32,4 @@ OUTPUT_FILE="${ALLSKY_TMP}/${FILE}" ) > "${OUTPUT_FILE}" # PD == Post Data -"${ALLSKY_SCRIPTS}/upload.sh" --silent "${OUTPUT_FILE}" "${IMG_DIR}" "${FILE}" "PD" +"${ALLSKY_SCRIPTS}/upload.sh" --silent "${OUTPUT_FILE}" "${IMGDIR}" "${FILE}" "PD" From b3fff65c7752a425cce302e669471bce97c415bf Mon Sep 17 00:00:00 2001 From: EricClaeys <83164203+EricClaeys@users.noreply.github.com> Date: Mon, 4 Oct 2021 13:27:13 -0500 Subject: [PATCH 2/3] ftp-settings.sh.repo: IMG_DIR and IMGDIR Allow both for now. IMG_DIR is the new name that's not fully implemented, and IMGDIR is the old name. --- scripts/ftp-settings.sh.repo | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ftp-settings.sh.repo b/scripts/ftp-settings.sh.repo index 35184d7f3..db8bff73b 100755 --- a/scripts/ftp-settings.sh.repo +++ b/scripts/ftp-settings.sh.repo @@ -5,8 +5,10 @@ PROTOCOL='ftp' USER='username' PASSWORD='password' HOST='example.com' -IMGDIR='/allsky/' +IMG_DIR='/allsky/' +IMGDIR="${IMG_DIR}" # for backwards compatibility - will be removed in the future VIDEOS_DIR='/allsky/videos/' +MP4DIR="${VIDEOS_DIR}" # for backwards compatibility - will be removed in the future KEOGRAM_DIR='/allsky/keograms/' STARTRAILS_DIR='/allsky/startrails/' From 960d0792ea9a737cda9ec9ac47438f91a0f9eb82 Mon Sep 17 00:00:00 2001 From: EricClaeys <83164203+EricClaeys@users.noreply.github.com> Date: Mon, 4 Oct 2021 14:29:00 -0500 Subject: [PATCH 3/3] ftp-settings.sh.repo: IMAGE_DIR Forgot that config.sh uses IMG_DIR, so had to rename ftp-settings.sh.repo's version to IMAGE_DIR. --- scripts/ftp-settings.sh.repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ftp-settings.sh.repo b/scripts/ftp-settings.sh.repo index db8bff73b..dc800b266 100755 --- a/scripts/ftp-settings.sh.repo +++ b/scripts/ftp-settings.sh.repo @@ -5,8 +5,8 @@ PROTOCOL='ftp' USER='username' PASSWORD='password' HOST='example.com' -IMG_DIR='/allsky/' -IMGDIR="${IMG_DIR}" # for backwards compatibility - will be removed in the future +IMGAGE_DIR='/allsky/' +IMGDIR="${IMGAGE_DIR}" # for backwards compatibility - will be removed in the future VIDEOS_DIR='/allsky/videos/' MP4DIR="${VIDEOS_DIR}" # for backwards compatibility - will be removed in the future KEOGRAM_DIR='/allsky/keograms/'