changeset 2047:7b18fb64dff1

Use rsync + ssh instead of scp for uploads.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 13 Feb 2019 10:52:46 +0200
parents 0f239d00eed8
children 0e3dbce7f79e
files Makefile.gen config.mak old/Makefile world/Makefile www/Makefile
diffstat 5 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Wed Feb 13 10:32:09 2019 +0200
+++ b/Makefile.gen	Wed Feb 13 10:52:46 2019 +0200
@@ -103,6 +103,6 @@
 	@hg2cl
 
 upload: tooltip.js $(addprefix $(MAP_PATH),$(addsuffix .html,$(MAP_FILES))) $(addprefix $(MAP_PATH),$(addsuffix .map,$(MAP_FILES))) $(wildcard $(MAP_PATH)*.loc)
-	@scp -C $? $(UPLOAD_URL)
+	$(RSCP) $? $(UPLOAD_URL)
 	@touch $@
 
--- a/config.mak	Wed Feb 13 10:32:09 2019 +0200
+++ b/config.mak	Wed Feb 13 10:52:46 2019 +0200
@@ -9,3 +9,6 @@
 #COLORMAP_OPTS=-u "www/urchin.inc.php" -a -C
 COLORMAP_OPTS=-a -C
 COLORMAP_HTML=-f html5
+
+RSCP = rsync -vptogz -e ssh
+
--- a/old/Makefile	Wed Feb 13 10:32:09 2019 +0200
+++ b/old/Makefile	Wed Feb 13 10:52:46 2019 +0200
@@ -50,7 +50,7 @@
 	@ln -s $< $@
 
 upload: $(TARGETS) *.loc
-	@scp -C $? $(UPLOAD_URL)
+	$(RSCP) $? $(UPLOAD_URL)
 	@touch $@
 
 clean:
--- a/world/Makefile	Wed Feb 13 10:32:09 2019 +0200
+++ b/world/Makefile	Wed Feb 13 10:52:46 2019 +0200
@@ -44,7 +44,7 @@
 
 # Upload changed files to site
 upload: $(TARGETS) $(LOCLIST)
-	@scp -C $? $(UPLOAD_URL)
+	$(RSCP) $? $(UPLOAD_URL)
 	@touch $@
 
 # Open PNG files in Gimp
@@ -55,7 +55,7 @@
 
 # Upload only *.loc files
 uploc: $(LOCLIST)
-	@scp $+ $(UPLOAD_URL)
+	$(RSCP) $+ $(UPLOAD_URL)
 
 # Fetch raw ASCII maps from bat.org to *.new
 fetch:
--- a/www/Makefile	Wed Feb 13 10:32:09 2019 +0200
+++ b/www/Makefile	Wed Feb 13 10:52:46 2019 +0200
@@ -4,9 +4,9 @@
 	@echo "Use 'make upload' or 'make dload'."
 
 upload: *.php *.css *.xml search.js wizards.txt
-	scp $? $(UPLOAD_URL)
+	$(RSCP) $? $(UPLOAD_URL)
 	touch $@
 
 dload:
-	scp $(UPLOAD_URL){*.php,*.css,*.xml,search.js,wizards.txt} .
+	$(RSCP) $(UPLOAD_URL){*.php,*.css,*.xml,search.js,wizards.txt} .