Merge pull request #889 from thomasjacquin/upload.sh-ftps

Add ftps to upload PROTOCOLs

config_repo/ftp-settings.sh.repo

@@ -6,8 +6,10 @@
 	#  "local"	copies to a location on your Pi.
 	#  "ftp"	uploads to an FTP server.
 	#		See the section for ftp PROTOCOL below.
+	#  "ftps"	uploads to an FTP server that supports secure FTP transfer.
+	# 		*** Use "ftps" instead of "ftp" if you can - it's more secure than ftp. ***
+	#		See the section for ftp PROTOCOL below.
 	#  "sftp"	(SSH file transfer) - uploads to an FTP server that supports secure transfer.
-	# 		Use "sftp" instead of "ftp" if you can - it's more secure.
 	#		See the section for sftp PROTOCOL below.
 	#  "scp"	(secure copy) - copies to a remote server.
 	#		See the section for scp PROTOCOL below.   NOTE: "scp" PROTOCOL IS NOT IMPLEMENTED YET.
@@ -67,7 +69,7 @@ IMGDIR="${IMAGE_DIR}"
 MP4DIR="${VIDEOS_DIR}"
 
 
-############### ftp, sftp, and scp PROTOCOLS only:
+############### ftp, ftps, sftp, and scp PROTOCOLS only:
 	# Enter the name of the remote server.  If you don't know it, ask your service provider.
 REMOTE_HOST=""
 

scripts/upload.sh

@@ -37,7 +37,7 @@ if [ $# -lt 3 ] ; then
 	echo "   'local_directory' is the name of an optional local directory the file should be"
 	echo "        copied to in addition to being uploaded."
 	echo
-	echo -n "For example: ${ME}  keogram-20210710.jpg  /keograms  keogram.jpg"
+	echo "For example: ${ME}  keogram-20210710.jpg  /keograms  keogram.jpg"
 	exit 1
 fi
 FILE_TO_UPLOAD="${1}"
@@ -90,7 +90,7 @@ elif [[ ${PROTOCOL} == "local" ]] ; then
 	cp "${FILE_TO_UPLOAD}" "${REMOTE_DIR}/${DESTINATION_FILE}"
 	RET=$?
 
-else # sftp/ftp
+else # sftp/ftp/ftps
 	# People sometimes have problems with ftp not working,
 	# so save the commands we use so they can run lftp manually to debug.