From unknown Tue Apr 28 06:29:20 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#744: [X2Go-Dev] Bug#744: user-local keystrokes.cfg does not work Reply-To: Mihai Moldovan , 744@bugs.x2go.org Resent-From: Mihai Moldovan Resent-To: x2go-dev@lists.x2go.org Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Thu, 15 Jan 2015 21:00:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 744 X-X2Go-PR-Package: x2goagent X-X2Go-PR-Keywords: Received: via spool by 744-submit@bugs.x2go.org id=B744.142135545712973 (code B ref 744); Thu, 15 Jan 2015 21:00:02 +0000 Received: (at 744) by bugs.x2go.org; 15 Jan 2015 20:57:37 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from Root24.de (powered.by.root24.eu [5.135.3.88]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 783713BC67 for <744@bugs.x2go.org>; Thu, 15 Jan 2015 21:57:35 +0100 (CET) Received: from nopileos.local (HSI-KBW-078-042-092-253.hsi3.kabel-badenwuerttemberg.de [78.42.92.253]) by mail.ionic.de (Postfix) with ESMTPSA id AEBAE4F00137; Thu, 15 Jan 2015 21:57:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ionic.de; s=default; t=1421355454; bh=4KpubytMo0cXQqTi+toESJuUoFHce8QdYgRYuenxZeo=; h=Date:From:To:CC:Subject:References:In-Reply-To:From; b=K1ZxXe78FFPwYnvrtHcv3NlktrPANu3901Pj5Y47lC4mL1GNn/G/AGbsbn+X42uJl XCMHs6c5+Srt50EkI/RRuEedBqQidoM5m2PsoVl0apyDNgVrJTj6Bw+/ykarutay77 8iDQyf3SoLB5975T02NR2tvYx9gLnb+K/1+sPkpM= Message-ID: <54B829B7.4030902@ionic.de> Date: Thu, 15 Jan 2015 21:57:27 +0100 From: Mihai Moldovan User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Horst Schirmeier CC: 744@bugs.x2go.org References: <20150115151045.GI22378@quickstop.soohrt.org> In-Reply-To: <20150115151045.GI22378@quickstop.soohrt.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mQo4XlOGGeo5fMOoQF3f2cdP0WanhVAWE" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --mQo4XlOGGeo5fMOoQF3f2cdP0WanhVAWE Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 15.01.2015 04:10 PM, Horst Schirmeier wrote: > debian/wrappers/x2goagent | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent > index 129c7ca..750c651 100644 > --- a/debian/wrappers/x2goagent > +++ b/debian/wrappers/x2goagent > @@ -29,7 +29,15 @@ test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIB= S=3D$NX_LIBS > =20 > export LD_LIBRARY_PATH > =20 > -NXAGENT_KEYSTROKEFILE=3D/etc/x2go/keystrokes.cfg > -export NXAGENT_KEYSTROKEFILE > +for CONFIG in ~/.x2go/config/keystrokes.cfg ~/.nx/config/keystrokes.cf= g \ > + /etc/x2go/keystrokes.cfg /etc/nxagent/keystrokes.cfg Do we actually WANT to make ~/.nx/foo override /etc/x2go/foo *for x2goagent*? Or do we rather want to get rid of ~/.nx and /etc/nxagent entirely within x2go components (which, really, would make some sort of sense, especially if $SOMETHING created ~/.nx/config/keystrokes.cfg and users wonder why /etc/x2go/keystrokes.cfg does not take any effect.) Actually, I see another problem there. Wouldn't it be smarter to consider both ~/.x2go/foo and /etc/x2go/keystrokes.cfg (if existent), with values in ~/.x2go/foo overriding those of the global configuration file? A priority-based merge would really be the thing we're looking for. I've got something like that lying around. It's not exactly small, though. And would benefit from being shared code, as it could (and also would) be used in both x2goagent and x2goserv= er. Mihai --mQo4XlOGGeo5fMOoQF3f2cdP0WanhVAWE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJUuCm8AAoJEB/WLtluJTqHDQUQALh+i8YsWIWhkJMxBeO68Mmm +0iNyaQ/xHYRU/YQLAy0fxRxO0tkc96mrECKrGeCHkR+5cWIiIiZrZZNOEQSypPz yu5NWFWFnqJcY0ALWvryPi+CzulbLbxH3AfW4peVPyns0RT1HIxhk5fcMCQqJG9Q x/Lxz+82E4SNdAknoD9+lZrJOKUPN1+J4ZGLQOtH/DCumjkPxTR+XkyJweB/gom6 /4QxALAmQd0VCBw8YjjmnKAbOXPg05PpMG4Rqf5Rktr5kCFUU5OmvwkI2YKo4kUM P+FHSfOUesDqCUmxFSo7N5X3qWtsXBYQpAd+65sQ4KdPADPzf5/kyGuwx/8vo85g OAV8R240XffYhERtnomGktJzNot8e7tozVJDgKeilLne64MjUAV4/Bk3SkN+dt0n aB9ImEIzpyCvU7hWpdJsznU3VoAL/x4T8Ygg26ZSpWVNyT4MHjw4Jk1zFDN6GcH8 oUgO33xb/genH521/M/+QUu2WjqxPVcFEGtwmMDaFw3ycB32p0lEw5gHdDgAIvxu 3ZzS+QUi43nqp24aXdZKlYvMXcuLb2u1OfUOTlfViejEIV897mqM0ZbdJIcEGOih zGdpYrUrS1IGw25iwM7c/nBu6xQ/fD85fzp3k9EeewffSsBDdoDblR4ByU9JWu+r 8QKeAwkECJmzMWfewbTy =M3DI -----END PGP SIGNATURE----- --mQo4XlOGGeo5fMOoQF3f2cdP0WanhVAWE--