diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2021-10-06 18:05:59 +0200 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2021-10-07 23:22:23 +0200 |
commit | 25bf911537cbd1d251398f1f4c859a038cdc2845 (patch) | |
tree | 7df3aa7ab8d8d97bfebbc48483b54544a9bb5333 /i3-dmenu-desktop | |
parent | eada44be1e3caf4f3e7ebea3060732a869e0b3c3 (diff) | |
download | i3-25bf911537cbd1d251398f1f4c859a038cdc2845.tar.gz i3-25bf911537cbd1d251398f1f4c859a038cdc2845.zip |
i3-dmenu-desktop: ignore duplicate files and directories
This is required when e.g. mpv is installed in the NixOS global system
environment *and* in the user environment.
Standalone reproducer:
mkdir -p test1/share/applications test2/share
ln -svf /usr/share/applications/i3.desktop test1/share/applications
ln -svf $PWD/test1/share/applications test2/share
export XDG_DATA_DIRS='test1/share:test2/share'
i3-dmenu-desktop
fixes #4522
Diffstat (limited to 'i3-dmenu-desktop')
-rwxr-xr-x | i3-dmenu-desktop | 2 |
1 files changed, 2 insertions, 0 deletions
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 ); |