From eb1357efb8ca3b74375fc38108ec86cec2afec04 Mon Sep 17 00:00:00 2001 From: David Sn Date: Mon, 5 Feb 2018 21:10:14 +0100 Subject: [PATCH 1/5] Add output of final command for debugging --- upload.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upload.sh b/upload.sh index bc64d1a..9c8ade8 100755 --- a/upload.sh +++ b/upload.sh @@ -34,4 +34,5 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -lftp -c "open -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" \ No newline at end of file +echo "open -u $PLUGIN_USERNAME,XXXXXX $PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" +lftp -c "open -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" From e10f8ebc29f714bff87ec8fc74fbb564441deea8 Mon Sep 17 00:00:00 2001 From: David Sn Date: Mon, 5 Feb 2018 22:25:13 +0100 Subject: [PATCH 2/5] Fix "unknown command" error --- upload.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/upload.sh b/upload.sh index 9c8ade8..e213e0e 100755 --- a/upload.sh +++ b/upload.sh @@ -34,5 +34,4 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -echo "open -u $PLUGIN_USERNAME,XXXXXX $PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -lftp -c "open -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" +lftp -c "open ftp://$PLUGIN_USERNAME:$FTP_PASSWORD@$PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" From d082be6fb13253e3ecb5ee81afe4ec563f415974 Mon Sep 17 00:00:00 2001 From: David Sn Date: Mon, 5 Feb 2018 22:37:10 +0100 Subject: [PATCH 3/5] Try again with another command syntax, sigh... --- upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.sh b/upload.sh index e213e0e..85c2b08 100755 --- a/upload.sh +++ b/upload.sh @@ -34,4 +34,4 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -lftp -c "open ftp://$PLUGIN_USERNAME:$FTP_PASSWORD@$PLUGIN_HOSTNAME; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" +lftp -e "set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME From 15f1fe48b2adac1f1cbd7f1ca1fcefa6d2c93285 Mon Sep 17 00:00:00 2001 From: David Sn Date: Mon, 5 Feb 2018 23:01:26 +0100 Subject: [PATCH 4/5] Show log output of ongoing transfers --- upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.sh b/upload.sh index 85c2b08..60fd831 100755 --- a/upload.sh +++ b/upload.sh @@ -34,4 +34,4 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -lftp -e "set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME +lftp -e "set xfer:log 1; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME From 783444af9bb15b431be5109d50aca43e37309d55 Mon Sep 17 00:00:00 2001 From: David Sn Date: Tue, 6 Feb 2018 20:36:37 +0100 Subject: [PATCH 5/5] Move PLUGIN_USERNAME variable to secrets --- upload.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload.sh b/upload.sh index 60fd831..1e27304 100755 --- a/upload.sh +++ b/upload.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ -z "$PLUGIN_USERNAME" ]; then +if [ -z "$FTP_USERNAME" ]; then echo "Need to set username" exit 1 fi @@ -34,4 +34,4 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -lftp -e "set xfer:log 1; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $PLUGIN_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME +lftp -e "set xfer:log 1; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $FTP_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME