summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrestis Floros <orestisflo@gmail.com>2021-10-07 23:38:47 +0200
committerGitHub <noreply@github.com>2021-10-07 23:38:47 +0200
commitab389e1d760585e758f343221da7758f7bc2c949 (patch)
tree6df8c75fe2451d1d1e51f269318412558a763595
parent8323108ca17c797a7ed507da62a39c83a490a74b (diff)
parent25bf911537cbd1d251398f1f4c859a038cdc2845 (diff)
downloadi3-ab389e1d760585e758f343221da7758f7bc2c949.tar.gz
i3-ab389e1d760585e758f343221da7758f7bc2c949.zip
Merge pull request #4565 from stapelberg/skip
i3-dmenu-desktop: ignore duplicate files and directories
-rw-r--r--RELEASE-NOTES-next1
-rwxr-xr-xi3-dmenu-desktop2
2 files changed, 3 insertions, 0 deletions
diff --git a/RELEASE-NOTES-next b/RELEASE-NOTES-next
index f9c1a4f1..0e1e83d7 100644
--- a/RELEASE-NOTES-next
+++ b/RELEASE-NOTES-next
@@ -35,6 +35,7 @@ option is enabled and only then sets a screenshot as background.
• i3-nagbar: add option to position on primary monitor
• alternate focusing tab/stack children-parent containers by clicking on their titlebars
• i3bar: use first bar config by default
+ • i3-dmenu-desktop: ignore duplicate files and directories (fixes crash on NixOS)
• i3-dump-log -f now uses UNIX sockets instead of pthreads. The UNIX socket approach
should be more reliable and also more portable.
• Implement the include config directive
diff --git a/i3-dmenu-desktop b/i3-dmenu-desktop
index 07fe8336..09670f65 100755
--- a/i3-dmenu-desktop
+++ b/i3-dmenu-desktop
@@ -154,6 +154,8 @@ find(
},
no_chdir => 1,
follow_fast => 1,
+ # Ignore any duplicate files and directories and proceed normally:
+ follow_skip => 2,
},
@searchdirs
);