diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-30 07:52:44 -0500 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2019-04-30 15:07:47 +0200 |
| commit | f56256f4883f941028a7f08ecaae939232406c65 (patch) | |
| tree | c37b3ca4aa0518a7977553fff059fa9fe62aa16d /modules | |
| parent | f18e2933d485d1d93d399b9637e26a0de1510747 (diff) | |
files: fix `find` invocation broken in c94eaa0e
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/files.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/files.nix b/modules/files.nix index 46e796ed1c5..0e8297f795d 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -74,7 +74,7 @@ in function checkNewGenCollision() { local newGenFiles newGenFiles="$(readlink -e "$newGenPath/home-files")" - find "$newGenFiles" -type f -or -type l \ + find "$newGenFiles" \( -type f -or -type l \) \ -exec bash ${check} "$newGenFiles" {} + } @@ -155,7 +155,7 @@ in local newGenFiles newGenFiles="$(readlink -e "$newGenPath/home-files")" - find "$newGenFiles" -type f -or -type l \ + find "$newGenFiles" \( -type f -or -type l \) \ -exec bash ${link} "$newGenFiles" {} + } |