diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -43,15 +43,18 @@ merge: merge_check_dups @# create directory structure rsync -a --include '*/' --exclude '*' "private/" "merged" rsync -a --include '*/' --exclude '*' "public/" "merged" - rm -rf merged/.git + rm -rf merged/.git merged/.git-crypt @# link files to their destination - $(FIND) ./public -not \( -path ./public/.git -prune \) -type f -print0 |\ + $(FIND) ./public -type f -print0 |\ xargs -0 -S 600 -I '{}' $(SHELL) -c '\ file={}; \ ln -s "$$(realpath $$file)" "./merged/$${file#./public/}"; \ ' - $(FIND) ./private -not \( -path ./private/.git -prune \) -type f -print0 |\ - xargs -0 -S 600 -I '{}' $(SHELL) -c '\ + $(FIND) ./private \ + -not \( -path ./private/.git -prune \) \ + -not \( -path ./private/.git-crypt -prune \) \ + -not \( -path ./private/.gitattributes -prune \) \ + -type f -print0 | xargs -0 -S 600 -I '{}' $(SHELL) -c '\ file={}; \ ln -s "$$(realpath $$file)" "./merged/$${file#./private/}"; \ ' |