diff options
| author | Christian Segundo | 2023-10-12 16:06:19 +0200 |
|---|---|---|
| committer | Christian Segundo | 2023-10-12 16:06:19 +0200 |
| commit | 4c8224b912336efab77e5024c1dc82cd1a44288c (patch) | |
| tree | cb8bdc199fafe6a5d1027eafb98dddea6906ee1a /Makefile | |
| parent | 17efd553ec39b4447ae98040114698a177690318 (diff) | |
| download | dotfiles-4c8224b912336efab77e5024c1dc82cd1a44288c.tar.gz | |
Ignore git stuff in private submodule
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/}"; \ ' |