From e4e80645542b40380e9e0884ece1be7cd8a11aa8 Mon Sep 17 00:00:00 2001 From: "Marcus M. Darden" <mmdarden@umich.edu> Date: Fri, 20 Sep 2019 11:50:42 -0400 Subject: [PATCH] Fix the REMOTE_PATH for sync2caen target Prior to this change, remote path was built up with a subdirectory, but without a separate call to ssh to create the sync root directory, rsync would not create the leaf directory. In addition, all manner of goofy filenames are used that include spaces, by people other than the author. Some quoting and double-quoting has been added and cleaned up to resolve (all of) these issues. --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 06ef2b1..b867d03 100644 --- a/Makefile +++ b/Makefile @@ -165,18 +165,17 @@ $(FULL_SUBMITFILE): $(FULL_SUBMITFILES) partialsubmit: identifier $(PARTIAL_SUBMITFILE) fullsubmit: identifier $(FULL_SUBMITFILE) -sync2caen: REMOTE_PATH := ${REMOTE_BASEDIR}/$(notdir $(shell pwd)) +sync2caen: REMOTE_PATH := ${REMOTE_BASEDIR}_${EXECUTABLE}_sync sync2caen: - ssh login.engin.umich.edu "mkdir -p '${REMOTE_PATH}'" # Synchronize local files into target directory on CAEN rsync \ -av \ - --delete \ --exclude '.git*' \ - --exclude '.vs*' \ + --exclude '.vs*' \ --filter=":- .gitignore" \ - ./ \ + "."/ \ "login.engin.umich.edu:'${REMOTE_PATH}/'" + echo "Files synced to CAEN at ~/${REMOTE_PATH}/" define MAKEFILE_HELP EECS281 Advanced Makefile Help -- GitLab