From a810fb212a2a7cc02b2dae360fbf086d13d8f00a Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Fri, 24 Jul 2015 12:37:23 +0200 Subject: [PATCH] added ftp password to lftp command --- .gitignore | 3 +++ Makefile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b7af9fb..1563c8a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ nosetests.xml .mr.developer.cfg .project .pydevproject + +# OWN STUFF +.ftp_pass.txt diff --git a/Makefile b/Makefile index c560f23..e172926 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ PUBLISHCONF=$(BASEDIR)/publishconf.py FTP_HOST=xsteadfastx.org/ FTP_USER=xstead_0 +FTP_PASS=`cat .ftp_pass.txt` FTP_TARGET_DIR=/ SSH_HOST=localhost @@ -95,7 +96,7 @@ dropbox_upload: publish cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR) ftp_upload: publish - lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "set ftp:ssl-allow no; mirror -R --ignore-time --no-perms --parallel=4 -e --use-cache -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit" + lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ftp:ssl-allow no; mirror -R --ignore-time --no-perms --parallel=4 -e --use-cache -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit" s3_upload: publish s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type