Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

files: fix find invocation broken in c94eaa0e

Browse source 
Add parens to expression so the `-exec` includes files matching both.

Otherwise (before this change) the `-exec` is only invoked for
links (`-type l`):

    file or (link -> doexec)
      =>
    (file or link) -> doexec

(cherry picked from commit f56256f488)
This commit is contained in:
Will Dietz 2019-04-30 07:52:44 -05:00 committed by Robert Helgesson
parent e3c4ec12cc
commit ef78cae6a4
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/files.nix
View file

@ -74,7 +74,7 @@ in
function checkNewGenCollision() { function checkNewGenCollision() {
local newGenFiles local newGenFiles
newGenFiles="$(readlink -e "$newGenPath/home-files")" newGenFiles="$(readlink -e "$newGenPath/home-files")"
find "$newGenFiles" -type f -or -type l \ find "$newGenFiles" \( -type f -or -type l \) \
-exec bash ${check} "$newGenFiles" {} + -exec bash ${check} "$newGenFiles" {} +
} }
@ -155,7 +155,7 @@ in
local newGenFiles local newGenFiles
newGenFiles="$(readlink -e "$newGenPath/home-files")" newGenFiles="$(readlink -e "$newGenPath/home-files")"
find "$newGenFiles" -type f -or -type l \ find "$newGenFiles" \( -type f -or -type l \) \
-exec bash ${link} "$newGenFiles" {} + -exec bash ${link} "$newGenFiles" {} +
} }