diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-16 22:43:54 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-17 15:44:24 -0700 |
| commit | 10fc6c4b8c3679a8b5a42d9ba051be9f626708cf (patch) | |
| tree | 09b5d4ca1acf40bab9c6f4a592779f858fae0514 /.mrconfig.in | |
| parent | a8e8f6c291d7414ebb3856a957b33d64223c994d (diff) | |
| download | dotfiles-10fc6c4b8c3679a8b5a42d9ba051be9f626708cf.tar.gz | |
tidy away lib/
Diffstat (limited to '.mrconfig.in')
| -rw-r--r-- | .mrconfig.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index 95220978..79406f9f 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -27,7 +27,7 @@ git_clean = git clean -xdff # actually shipped with upstream mr, but use an include command that # will always work -include = cat ~/src/dotfiles/lib/mr/dgit +include = cat ~/src/dotfiles/lib-src/mr/dgit # --- git-svn @@ -46,9 +46,9 @@ git_update = git pull-safe # will always work include = # stow is not available on Windows - if [ -e "$HOME/src/dotfiles/lib/mr/stow" ] \ + if [ -e "$HOME/src/dotfiles/lib-src/mr/stow" ] \ && ! [ "$(perl -e 'print $^O')" = "msys" ]; then - cat "$HOME/src/dotfiles/lib/mr/stow" + cat "$HOME/src/dotfiles/lib-src/mr/stow" fi # --- joeyh's code for specifying what machine we're on for repo skip @@ -132,8 +132,7 @@ lib = # [ -L "src/build-area" ] || ln -s -T /tmp/debuild src/build-area [ -e "Downloads" ] || ln -s tmp Downloads # clean up after additions to .stow-local-ignore - find bin lib/aid lib/perl5 lib/hooks \ - -type l 2>/dev/null | while read -r link; do + find bin lib -type l 2>/dev/null | while read -r link; do if readlink "$link" | grep --quiet "^[../]*/.STOW/"; then rm "$link" fi @@ -146,6 +145,10 @@ lib = lib/perl5 \ lib/hooks \ lib/athena \ + lib/bins \ + lib/img \ + lib/mr \ + lib/src \ local/anacron/spool \ -type d -empty -delete 2>/dev/null ||: ) |