# HG changeset patch # User Omair Majid # Date 1412960372 14400 # Node ID 34d29998b82fb0d60f8ef1ae20bd357d999488e9 # Parent 06f1ae8aab446ad45d605fc5a6ffce099b0df440 Handle same remote and local username correctly. diff -r 06f1ae8aab44 -r 34d29998b82f Makefile --- a/Makefile Thu Oct 09 18:16:02 2014 -0400 +++ b/Makefile Fri Oct 10 12:59:32 2014 -0400 @@ -16,11 +16,12 @@ REMOTE_PATH = /var/lib/thermostat-web REMOTE_ARGS = --exclude-from=$(EXCLUDE_FILE) -arvz ./ +ifndef REMOTE_USER + REMOTE_USER=$(USER) +endif + all: deploy deploy: - if [ $(REMOTE_USER)x = x ] ; then \ - REMOTE_USER=${USER} ; \ - fi $(RSYNC) $(REMOTE_ARGS) $(REMOTE_USER)@$(REMOTE_SERVER):$(REMOTE_PATH)