aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-05-05 17:05:23 -0400
committerbnewbold <bnewbold@robocracy.org>2016-05-05 17:05:23 -0400
commit870344c8d1f13df231ada78837d0d055f5d161e9 (patch)
tree806da97c751e02a30ba40f35f0a986752e428318
parent83db8af21dc5b41a89ba717d6fc860f61406bd1d (diff)
downloadbnewnet-870344c8d1f13df231ada78837d0d055f5d161e9.tar.gz
bnewnet-870344c8d1f13df231ada78837d0d055f5d161e9.zip
Makefile: add 'up' alias; fix commenting out
-rw-r--r--Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 27342a3..8ac5520 100644
--- a/Makefile
+++ b/Makefile
@@ -51,11 +51,11 @@ help:
@echo ' make stopserver stop local server '
@echo ' make ssh_upload upload the web site via SSH '
@echo ' make rsync_upload upload the web site via rsync+ssh '
- #@echo ' make dropbox_upload upload the web site via Dropbox '
- #@echo ' make ftp_upload upload the web site via FTP '
- #@echo ' make s3_upload upload the web site via S3 '
- #@echo ' make cf_upload upload the web site via Cloud Files'
- #@echo ' make github upload the web site via gh-pages '
+#@echo ' make dropbox_upload upload the web site via Dropbox '
+#@echo ' make ftp_upload upload the web site via FTP '
+#@echo ' make s3_upload upload the web site via S3 '
+#@echo ' make cf_upload upload the web site via Cloud Files'
+#@echo ' make github upload the web site via gh-pages '
@echo ' '
@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html '
@echo 'Set the RELATIVE variable to 1 to enable relative urls '
@@ -102,6 +102,9 @@ publish:
ssh_upload: publish
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+up: rsync_upload
+ rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+
rsync_upload: publish
rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
@@ -121,4 +124,4 @@ github: publish
ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
git push origin $(GITHUB_PAGES_BRANCH)
-.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github up