From 732be7695d632a11a8b144ebf9d0b727de28ed9f Mon Sep 17 00:00:00 2001 From: Max Melchert <maximilian.melchert@stud.hs-bochum.de> Date: Fri, 14 Mar 2025 11:44:22 +0100 Subject: [PATCH] fix: 'rsync --relative' only at upload --- src/makefile/basic.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/makefile/basic.mk b/src/makefile/basic.mk index 2186ccb..a67abfb 100644 --- a/src/makefile/basic.mk +++ b/src/makefile/basic.mk @@ -35,7 +35,7 @@ COPY_LINKS_AS_FILES := false LOGIN := $(SERVER_USER)@$(SERVER_HOST) SSH := ssh $(LOGIN) -RSYNC := rsync --relative --archive --compress --progress $(if $(filter true,$(COPY_LINKS_AS_FILES)),--copy-links) +RSYNC := rsync --archive --compress --progress $(if $(filter true,$(COPY_LINKS_AS_FILES)),--copy-links) MAMBA := source $(CONDA_PATH)/etc/profile.d/conda.sh && mamba # TODO: mamba.sh CONDA := source $(CONDA_PATH)/etc/profile.d/conda.sh && conda @@ -50,7 +50,7 @@ install: # install conda environment ' upload: # upload project files from client to server - $(RSYNC) $(foreach file,$(LOCAL_UPLOAD_FILES),$(LOCAL_PROJECT_DIR)/$(file)) $(LOGIN):$(REMOTE_PROJECT_DIR) + $(RSYNC) --relative $(foreach file,$(LOCAL_UPLOAD_FILES),$(LOCAL_PROJECT_DIR)/$(file)) $(LOGIN):$(REMOTE_PROJECT_DIR) run: # execute main script on server $(SSH) '\ -- GitLab