From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: zsh-workers-return-43484-ml=inbox.vuxu.org@zsh.org
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.0 required=5.0 tests=FREEMAIL_FROM,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no
	version=3.4.2
Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2])
	by inbox.vuxu.org (OpenSMTPD) with ESMTP id b6fcc51c
	for <ml@inbox.vuxu.org>;
	Tue, 18 Sep 2018 12:50:19 +0000 (UTC)
Received: (qmail 675 invoked by alias); 18 Sep 2018 12:50:05 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 43484
Received: (qmail 4441 invoked by uid 1010); 18 Sep 2018 12:50:05 -0000
X-Qmail-Scanner-Diagnostics: from mail-wm1-f45.google.com by f.primenet.com.au (envelope-from <maximilian.bosch.27@gmail.com>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(209.85.128.45):SA:0(-1.2/5.0):. 
 Processed in 1.873905 secs); 18 Sep 2018 12:50:05 -0000
X-Envelope-From: maximilian.bosch.27@gmail.com
X-Qmail-Scanner-Mime-Attachments: |signature.asc|
X-Qmail-Scanner-Zip-Files: |
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:date:from:to:subject:message-id:mime-version
         :content-disposition:user-agent;
        bh=6UK9z9uH1Nv1NTLvXuBe0/moTQl9b0dIiNGwfYGqH3Y=;
        b=diBXcjISczGOp27u9AtLIcSszVzCkZantlgpjOwYRpon3T40u1FZ6pQ9sO04doQO97
         qXwjgE512iuVepwIa3fZQwoCoHWE/BYSTG16NLe7ANMsD2FkRm/KOBjeTBfsGdLBy3mF
         Px1QNRG0yXnmIBCI0eeVN/2461jo5tIbU+QdAF+t+1LGHPjOJP1Yt3CXcKzFxghtxZp6
         J+ONz2BKqp22jpTV+UsvE2id63f41MkLJK+ROaut28NvfG3I1yFILcfiSN5SeeuA8BxL
         xoryKne99JwF7OFkSnpKciPT7PuYCLvPFmelQ7urL3FZV0MNuyaJ/wN/VOAllfVDBYGk
         sBhg==
X-Gm-Message-State: APzg51A1jOQ0QpAfb8w98gBseSRBEQNy0/Cxp7o1NDG2hMLOkfXnTEBG
	tSfS5Ssg3LIaTSWcIY96P38b+Js0
X-Google-Smtp-Source: ANB0VdZE9mVaiox9ZKXZ/Wcgngh6CPIzOc0pcJJvTiuYG7azu4n7U+zjCnWP5IV4f1w891KDvKUuhg==
X-Received: by 2002:a1c:7305:: with SMTP id d5-v6mr15690943wmb.53.1537274998826;
        Tue, 18 Sep 2018 05:49:58 -0700 (PDT)
Date: Tue, 18 Sep 2018 14:49:51 +0200
From: Maximilian Bosch <maximilian@mbosch.me>
To: zsh-workers@zsh.org
Subject: PATCH: search XDG_DATA_DIRS in _setxkbmap completion
Message-ID: <20180918124951.4nbyjhbuqnkioqrt@hauptschuhle>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="bemaympqhxmdbp4b"
Content-Disposition: inline
User-Agent: NeoMutt/20180716

--bemaympqhxmdbp4b
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

this patch searches in $XDG_DATA_DIRS for `<XDG_DATA_DIR>/share/X11/xkb`
rather than using `/usr/lib` and `/usr/share`.

This is helpful on distros such as NixOS which don't adopt the FHS[1][2].

Maximilian

[1] https://github.com/NixOS/nixpkgs/pull/46152#issuecomment-421755892
[2] https://github.com/NixOS/nixpkgs/issues/46025

diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkb=
map
index f7310ecdd..b3f8b1a46 100644
--- a/Completion/X/Command/_setxkbmap
+++ b/Completion/X/Command/_setxkbmap
@@ -10,12 +10,18 @@ _setxkbmap() {
=20
     # 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=3D$dir
+    setopt sh_word_split
+    local IFS=3D:
+    for dir in $XDG_DATA_DIRS; do
+        fullName=3D"$dir/X11/xkb"
+        if [ -d $fullName ] ; then
+           sourcedir=3D$fullName
            break
         fi
     done
+    unset IFS
+    unsetopt sh_word_split
+
     [ -d $sourcedir ] || return 1
=20
     local -a arguments

--bemaympqhxmdbp4b
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEEPg3TILK+tBEQDaTVCR2/TR/Ea44FAlug9GwACgkQCR2/TR/E
a44uIgf8DpxFyf3rMAc3zvqD7OumPUXx10P5PNhGNZpShoUYfSoiJgsu5zAOQDLF
2C3T9HUu1vOTW624l7kE+jD0HGaUDDv4aecyYFLaGvW2ae1nid/jMQYcNyHfmC67
1UyBVRNZe3kyGwfbLO8yOqWpIGWmHIe8sw63Zv1oRlL3Rto0QorXfN9t5ZN8NMJn
74CU3OjHJWpKjn+CHeq1tqxWzgyYV7EApZF1VFR7LRInjuVtTrnP+dvCkJ0Bx64U
gx6FiKUUTlATRdlt81AYnS7UL05edLkmU6zoLDylmTO2wTjILM5CcKTt2Bb42bkl
MEek+Y0h9gMmY7ed2g3QnjCXUnjbkw==
=7BQu
-----END PGP SIGNATURE-----

--bemaympqhxmdbp4b--