From 2518ffbfb0db7a5517501b126d0fd0e7c3bcad5c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 21 Nov 2020 22:56:28 +0000 Subject: [PATCH] deployment work Signed-off-by: Ian Jackson --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 057eb16a..6eea28d4 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,9 @@ libraries: $(LIBRARY_FILES) #---------- deployment ---------- -DEPLOY_BASE=ian@login.chiark.greenend.org.uk:/volatile/Otter +DEPLOY_USER=ian@login.chiark.greenend.org.uk +DEPLOY_BASE=$(DEPLOY_USER):/volatile/Otter +DEPLOY_FINISH=/home/Otter/etc/deploy-finish deploy: stamp/cargo.deploy-build bundled-sources assets libraries rsync -zv --progress $(addprefix $(DEPLOY_TARGET_DIR)/,$(PROGRAMS)) $(DEPLOY_BASE)/bin/ @@ -233,8 +235,7 @@ deploy: stamp/cargo.deploy-build bundled-sources assets libraries rsync -r --delete --exclude=\*~ library $(DEPLOY_BASE)/. rsync -r $(FILEASSETS) $(addprefix $(WASM_PACKED)/, $(WASM_ASSETS)) \ $(DEPLOY_BASE)/assets/ - @echo - @echo Deployment file copies complete. + ssh -o BatchMode=true $(DEPLOY_USER) $(DEPLOY_FINISH) #$(DEPLOY_BASE)/bundled-sources -- 2.30.2