Skip to content

Commit 8d64285

Browse files
committed
fix(Makefile): fix component rsync
Currently, trying to issue a `make -C <component> build` will rsync the contents of that component directory to /home/core/share instead of /home/core/share/<component>. This commit makes all rsync commands rsync relative to the root directory (using the path to includes.mk as a reference).
1 parent 5b2b6c0 commit 8d64285

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

includes.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ define ssh_all
2929
endef
3030

3131
define rsync_all
32-
for host in $(DEIS_HOSTS); do rsync -Pave "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --exclude=venv/ --exclude=.git/ --exclude='*.pyc' $(shell pwd)/* core@$$host:/home/core/share; done
32+
for host in $(DEIS_HOSTS); do rsync -Pave "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --exclude=venv/ --exclude=.git/ --exclude='*.pyc' $(SELF_DIR)/* core@$$host:/home/core/share; done
3333
endef
3434

3535
define echo_cyan
@@ -40,6 +40,7 @@ define echo_yellow
4040
@echo "\033[0;33m$(subst ",,$(1))\033[0m"
4141
endef
4242

43+
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
4344
ROUTER_UNITS = $(shell seq -f "deis-router.%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
4445

4546
check-fleet:

0 commit comments

Comments
 (0)