Date: Mon, 26 Mar 2012 20:52:49 +0200
From: Stefano Zacchiroli <zack@upsilon.cc>
To: notmuch@notmuchmail.org
Subject: Re: Bug#628018: [PATCH] notmuch-mutt utility for notmuch/contrib/
Message-ID: <20120326185249.GA2534@upsilon.cc>
Mail-Followup-To: notmuch@notmuchmail.org, Stefano Zacchiroli
 <zack@upsilon.cc>
References: <87ehsfr6lb.fsf@zancas.localnet>
	<m2aa33o81v.fsf@guru.guru-group.fi>
	<87d37zl7qe.fsf@servo.finestructure.net>
	<20120326152902.GA11610@upsilon.cc>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="gatW/ieO32f1wygP"
Content-Disposition: inline
In-Reply-To: <20120326152902.GA11610@upsilon.cc>
User-Agent: Mutt/1.5.21 (2010-09-15)
Precedence: list


--gatW/ieO32f1wygP
Content-Type: multipart/mixed; boundary="LZvS9be/3tNcYl/X"
Content-Disposition: inline


--LZvS9be/3tNcYl/X
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Mar 26, 2012 at 05:29:02PM +0200, Stefano Zacchiroli wrote:
> But while it's trivial to make notmuch-mutt itself support
> $XDG_CACHE_HOME, it is less so for the Mutt configuration snippet
> (i.e. the notmuch-mutt.rc file which is part of my submission). AFAICT
> the <change-folder-readonly> function does not support variable
> expansions, not to mention default values while doing so.

=2E.. but Mutt configuration has backtick expansions! So never mind the
above.

The attached patch should be all that's needed to proper $XDG_CACHE_HOME
support, according to XDG basedir spec.

If you folks now consider the contrib submission good enough for
inclusion, feel free to just "git am" the 3 patches. If you want me to
implement other changes --- including bureaucratic stuff like merging
patches together --- just let me know!

Cheers.
--=20
Stefano Zacchiroli     zack@{upsilon.cc,pps.jussieu.fr,debian.org} . o .
Ma=EEtre de conf=E9rences   ......   http://upsilon.cc/zack   ......   . . o
Debian Project Leader    .......   @zack on identi.ca   .......    o o o
=AB the first rule of tautology club is the first rule of tautology club =BB

--LZvS9be/3tNcYl/X
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0003-notmuch-mutt-XDG_CACHE_HOME-support-as-per-XDG-based.patch"
Content-Transfer-Encoding: quoted-printable

=46rom f68f36448f5bc63211c12b9e53e9db603ed76178 Mon Sep 17 00:00:00 2001
=46rom: Stefano Zacchiroli <zack@upsilon.cc>
Date: Mon, 26 Mar 2012 20:47:34 +0200
Subject: [PATCH] notmuch-mutt: $XDG_CACHE_HOME support as per XDG basedir
 spec

---
 contrib/notmuch-mutt/notmuch-mutt    |    4 +++-
 contrib/notmuch-mutt/notmuch-mutt.rc |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 mode change 100755 =3D> 100644 contrib/notmuch-mutt/notmuch-mutt

diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmu=
ch-mutt
old mode 100755
new mode 100644
index 29674ec..9cd01ec
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -20,7 +20,9 @@ use String::ShellQuote;
 use Term::ReadLine;
=20
=20
-my $cache_dir =3D "$ENV{HOME}/.cache/notmuch/mutt";
+my $xdg_cache_dir =3D "$ENV{HOME}/.cache";
+$xdg_cache_dir =3D $ENV{XDG_CACHE_HOME} if $ENV{XDG_CACHE_HOME};
+my $cache_dir =3D "$xdg_cache_dir/notmuch/mutt";
=20
=20
 # create an empty maildir (if missing) or empty an existing maildir"
diff --git a/contrib/notmuch-mutt/notmuch-mutt.rc b/contrib/notmuch-mutt/no=
tmuch-mutt.rc
index 269f03f..c0ff000 100644
--- a/contrib/notmuch-mutt/notmuch-mutt.rc
+++ b/contrib/notmuch-mutt/notmuch-mutt.rc
@@ -1,8 +1,8 @@
 macro index <F8> \
-      "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --pr=
ompt search<enter><change-folder-readonly>~/.cache/notmuch/mutt/results<ent=
er>" \
+      "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --pr=
ompt search<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.ca=
che}/notmuch/mutt/results`<enter>" \
       "notmuch: search mail"
 macro index <F9> \
-      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thre=
ad<enter><change-folder-readonly>~/.cache/notmuch/mutt/results<enter><enter=
-command>set wait_key<enter>" \
+      "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thre=
ad<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notm=
uch/mutt/results`<enter><enter-command>set wait_key<enter>" \
       "notmuch: reconstruct thread"
 macro index <F6> \
       "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt tag =
-inbox<enter>" \
--=20
1.7.9.1


--LZvS9be/3tNcYl/X--

--gatW/ieO32f1wygP
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIVAwUBT3C7AJwxUDxthmOWAQjA7A/9Ebr60Dg4h6uCDYPd+cRwlQT9EwBZfxb0
fe3oNwH61paegJ8tiPANqYnExJhxwKkcmqEIhpddvkjLRsvs0upsnrjLfJ6vho3e
E7GFAycAeZR2pcT2SUG/2dzlo9izQMzoMOWRZD5RPVC/k4G0ZoDI4BPs4x0usgtN
rS/8n4tIYGHkH1+BPsyN6R3UDBDAngB5G2xcfBH/WCjV+IomcytYypofIyeTUaR9
VT/eYMYvCU7oLrIQK8qe/tPgag2sw3MrOb/KzXcQGjl2rQ+Q+6JRqJJac7xq01Y+
3SCjA2I30vlcrcese8A4rL+UgRIIhESCfjSg4i6eTqvEtw8V8Twf/bEJOHqiRAu1
8s9mQ3fhOmD679Wg76fi7tA5vFjgotg/3kAVA6TRSLNZfSyHFLaSu8rplrlD6mJ0
LjGM+G7Dg/cZYjSzSrzs9UYKsbLS/yOlyy8ygrKlfQtVSxn6t4L7fShuP5bAuqpv
nwuykfLTqzhq3AAZCXsrmnDHgYwvL1e3s7G0ZKU9adEFv9tJ0++iO8JiTpZ6eoaW
XA+WFr5KE1mFCBjSMLT1Z6Bl/645vIjFDfJ2xZvX7P11wlnmWVKwm9r4NHvglFhB
pdvfKzvW3Z9FAIYtMY/2ISMorNaFbwkvdFxW9ndQPrkjUm03Wq/Fk5hGmyq9iLx3
HaqPbFmMzKQ=
=8C2l
-----END PGP SIGNATURE-----

--gatW/ieO32f1wygP--