diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2018-12-24 04:40:22 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2018-12-24 04:40:22 +0100 |
| commit | bf8b7f713a5b04a191f4596fb86bbbfca0a855ce (patch) | |
| tree | b647a8dc990c8c845b8a8eca7bf92fbbf17e1fb5 /Completion/X/Command/_setxkbmap | |
| parent | 06946d431a4426c6e5dffec1d7edb17c1dbd467c (diff) | |
| parent | 9dbde9e9c7d22ee0d301e4a2fecf97906d1ddce9 (diff) | |
| download | zsh-bf8b7f713a5b04a191f4596fb86bbbfca0a855ce.tar.gz zsh-bf8b7f713a5b04a191f4596fb86bbbfca0a855ce.zip | |
New upstream release candidate 5.6.2-test-2
Merge branch 'upstream' at 'zsh-5.6.2-test-2' into branch debian
Diffstat (limited to 'Completion/X/Command/_setxkbmap')
| -rw-r--r-- | Completion/X/Command/_setxkbmap | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkbmap index f7310ecdd..486268ed7 100644 --- a/Completion/X/Command/_setxkbmap +++ b/Completion/X/Command/_setxkbmap @@ -9,10 +9,12 @@ _setxkbmap() { setopt extendedglob # xkb files may be in different places depending on system - local dir sourcedir - for dir in /usr/lib/X11/xkb /usr/share/X11/xkb; do - if [ -d $dir ] ; then - sourcedir=$dir + local dir sourcedir fullname + local -a searchdirs=(${XDG_DATA_HOME:-~/.local/share} ${(s.:.)XDG_DATA_DIRS:-/usr/lib:/usr/share:/usr/local/lib:/usr/local/share}) + for dir in $searchdirs; do + fullname="$dir/X11/xkb" + if [ -d $fullname ] ; then + sourcedir=$fullname break fi done |