From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Thompson, David" Subject: Re: Using 'system*' instead of 'system' in 'guix environment' Date: Thu, 8 Oct 2015 21:29:39 -0400 Message-ID: References: <87io6iqhbt.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <87ziztyext.fsf@gnu.org> <87vbahpfrn.fsf@gnu.org> <87io6hpaie.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=94eb2c0550fed16ae40521a1e98a Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkMVj-0007zx-W6 for guix-devel@gnu.org; Thu, 08 Oct 2015 21:30:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkMVB-0001cU-L0 for guix-devel@gnu.org; Thu, 08 Oct 2015 21:30:15 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:34492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkMVB-0001cK-Et for guix-devel@gnu.org; Thu, 08 Oct 2015 21:29:41 -0400 Received: by ykdg206 with SMTP id g206so65830665ykd.1 for ; Thu, 08 Oct 2015 18:29:40 -0700 (PDT) In-Reply-To: <87io6hpaie.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Cc: guix-devel --94eb2c0550fed16ae40521a1e98a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Oct 8, 2015 at 12:53 PM, Ludovic Court=C3=A8s wrote: > "Thompson, David" skribis: > >> On Thu, Oct 8, 2015 at 10:59 AM, Ludovic Court=C3=A8s wro= te: >> >>> I guess we must still support -E for compatibility. Probably it should >>> do an implicit =E2=80=98sh -c=E2=80=99? >> >> This introduces implementation issues. What if a user provides both a >> -E command *and* a command after '--'? What's the sane thing to do? > > I=E2=80=99d consider this a bug in the user=E2=80=99s mind ;-) and would = do whatever is > easiest. > >> I also don't feel strongly that we need to keep flags around for >> compatibility this early in the game, given that we are alpha software >> and such. > > I think it=E2=80=99s neither black nor white. > > For instance, I use it at work for continuous integration. I can > definitely migrate the scripts to the new syntax, but it=E2=80=99s best i= f it > doesn=E2=80=99t break overnight. > > So we could remove -E from =E2=80=98--help=E2=80=99 and from the manual, = but still keep > it around for a while. Here is the patch that does this. Thanks, - Dave --94eb2c0550fed16ae40521a1e98a Content-Type: text/x-diff; charset=US-ASCII; name="0001-scripts-environment-Use-system-instead-of-system.patch" Content-Disposition: attachment; filename="0001-scripts-environment-Use-system-instead-of-system.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ifiz69400 RnJvbSA0YmUwYzJiZmQyZTJlOWEwM2Q4NjBjZmIyZmY5MmFhNjZjYmZhYTcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBUaG9tcHNvbiA8ZHRob21wc29uMkB3b3JjZXN0ZXIu ZWR1PgpEYXRlOiBUaHUsIDggT2N0IDIwMTUgMjE6MjM6MDkgLTA0MDAKU3ViamVjdDogW1BBVENI XSBzY3JpcHRzOiBlbnZpcm9ubWVudDogVXNlIHN5c3RlbSogaW5zdGVhZCBvZiBzeXN0ZW0uCgpU aGlzIGFsbG93cyBmb3IgZGlyZWN0IHByb2dyYW0gaW52b2thdGlvbiB3aXRob3V0IG5lZWRpbmcg YSBzaGVsbCB0byBhY3QKYXMgYSBjb21tYW5kIGludGVycHJldGVyLgoKKiBndWl4L3NjcmlwdHMv ZW52aXJvbm1lbnQuc2NtICglZGVmYXVsdC1zaGVsbCk6IE5ldyB2YXJpYWJsZS4KICAoc2hvdy1o ZWxwKTogQWRqdXN0IGRlc2NyaXB0aW9uLiAgUmVtb3ZlICctLWV4ZWMnIHJlZmVyZW5jZS4KICAo JWRlZmF1bHQtb3B0aW9ucyk6IFVzZSAnJWRlZmF1bHQtc2hlbGwnLgogICglb3B0aW9ucyk6IEFk anVzdCAnLS1leGVjJyB0byBydW4gY29tbWFuZCB2aWEgdGhlIGRlZmF1bHQgc2hlbGwuCiAgKHBh cnNlLWFyZ3MpOiBOZXcgcHJvY2VkdXJlLgogIChndWl4LWVudmlyb25tZW50KTogVXNlICdwYXJz ZS1hcmdzJy4gIFVzZSAnc3lzdGVtKicgaW5zdGVhZCBvZgogICdzeXN0ZW0nLgoqIGd1aXgvdXRp bHMuc2NtIChzcGxpdCk6IE5ldyBwcm9jZWR1cmUuCiogdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC5z aDogQWRqdXN0IHRlc3RzIHRvIHVzZSAnLS0nIGluc3RlYWQgb2YKICAnLS1leGVjJy4KKiB0ZXN0 cy91dGlscy5zY206IEFkZCB0ZXN0cyBmb3IgJ3NwbGl0Jy4KKiBkb2MvZ3VpeC50ZXhpICgiSW52 b2tpbmcgZ3VpeCBlbnZpcm9ubWVudCIpOiBVc2UgbmV3IHN5bnRheC4gIFJlbW92ZQogICctLWV4 ZWMnIGRvY3VtZW50YXRpb24uCi0tLQogZG9jL2d1aXgudGV4aSAgICAgICAgICAgICAgICB8IDE2 ICsrKysrKy0tLS0tLS0tLS0KIGd1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20gfCAzOCArKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogZ3VpeC91dGlscy5zY20gICAgICAg ICAgICAgICB8IDE4ICsrKysrKysrKysrKysrKysrKwogdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC5z aCAgICB8ICA0ICsrLS0KIHRlc3RzL3V0aWxzLnNjbSAgICAgICAgICAgICAgfCAxNCArKysrKysr KysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kb2MvZ3VpeC50ZXhpIGIvZG9jL2d1aXgudGV4aQppbmRleCA2ZGE3 MjgxLi4zOWI3NmM3IDEwMDY0NAotLS0gYS9kb2MvZ3VpeC50ZXhpCisrKyBiL2RvYy9ndWl4LnRl eGkKQEAgLTQ1MzgsMTEgKzQ1MzgsMTIgQEAgYW5kIEVtYWNzIGFyZSBhdmFpbGFibGU6CiBndWl4 IGVudmlyb25tZW50IGd1aWxlIGVtYWNzCiBAZW5kIGV4YW1wbGUKIAotU29tZXRpbWVzIGFuIGlu dGVyYWN0aXZlIHNoZWxsIHNlc3Npb24gaXMgbm90IGRlc2lyZWQuICBUaGUKLUBjb2Rley0tZXhl Y30gb3B0aW9uIGNhbiBiZSB1c2VkIHRvIHNwZWNpZnkgdGhlIGNvbW1hbmQgdG8gcnVuIGluc3Rl YWQuCitTb21ldGltZXMgYW4gaW50ZXJhY3RpdmUgc2hlbGwgc2Vzc2lvbiBpcyBub3QgZGVzaXJl ZC4gIEFuIGFyYml0cmFyeQorY29tbWFuZCBtYXkgYmUgaW52b2tlZCBieSBwbGFjaW5nIHRoZSBA Y29kZXstLX0gdG9rZW4gdG8gc2VwYXJhdGUgdGhlCitjb21tYW5kIGZyb20gdGhlIHJlc3Qgb2Yg dGhlIGFyZ3VtZW50czoKIAogQGV4YW1wbGUKLWd1aXggZW52aXJvbm1lbnQgZ3VpbGUgLS1leGVj PW1ha2UKK2d1aXggZW52aXJvbm1lbnQgZ3VpbGUgLS0gbWFrZSAtajQKIEBlbmQgZXhhbXBsZQog CiBJbiBvdGhlciBzaXR1YXRpb25zLCBpdCBpcyBtb3JlIGNvbnZlbmllbnQgdG8gc3BlY2lmeSB0 aGUgbGlzdCBvZgpAQCAtNDU1MSw3ICs0NTUyLDcgQEAgcnVucyBAY29tbWFuZHtweXRob259IGZy b20gYW4gZW52aXJvbm1lbnQgY29udGFpbmluZyBQeXRob25AdGlle30yLjcgYW5kCiBOdW1QeToK IAogQGV4YW1wbGUKLWd1aXggZW52aXJvbm1lbnQgLS1hZC1ob2MgcHl0aG9uMi1udW1weSBweXRo b24tMi43IC1FIHB5dGhvbgorZ3VpeCBlbnZpcm9ubWVudCAtLWFkLWhvYyBweXRob24yLW51bXB5 IHB5dGhvbi0yLjcgLS0gcHl0aG9uCiBAZW5kIGV4YW1wbGUKIAogVGhlIGF2YWlsYWJsZSBvcHRp b25zIGFyZSBzdW1tYXJpemVkIGJlbG93LgpAQCAtNDU4MiwxMSArNDU4Myw2IEBAIEFzIGFuIGV4 YW1wbGUsIEB2YXJ7ZmlsZX0gbWlnaHQgY29udGFpbiBhIGRlZmluaXRpb24gbGlrZSB0aGlzCiBA dmVyYmF0aW1pbmNsdWRlIGVudmlyb25tZW50LWdkYi5zY20KIEBlbmQgZXhhbXBsZQogCi0KLUBp dGVtIC0tZXhlYz1AdmFye2NvbW1hbmR9Ci1AaXRlbSAtRSBAdmFye2NvbW1hbmR9Ci1FeGVjdXRl IEB2YXJ7Y29tbWFuZH0gaW4gdGhlIG5ldyBlbnZpcm9ubWVudC4KLQogQGl0ZW0gLS1hZC1ob2MK IEluY2x1ZGUgYWxsIHNwZWNpZmllZCBwYWNrYWdlcyBpbiB0aGUgcmVzdWx0aW5nIGVudmlyb25t ZW50LCBhcyBpZiBhbgogQGl7YWQgaG9jfSBwYWNrYWdlIHdlcmUgZGVmaW5lZCB3aXRoIHRoZW0g YXMgaW5wdXRzLiAgVGhpcyBvcHRpb24gaXMKQEAgLTQ1OTYsNyArNDU5Miw3IEBAIHBhY2thZ2Ug ZXhwcmVzc2lvbiB0byBjb250YWluIHRoZSBkZXNpcmVkIGlucHV0cy4KIEZvciBpbnN0YW5jZSwg dGhlIGNvbW1hbmQ6CiAKIEBleGFtcGxlCi1ndWl4IGVudmlyb25tZW50IC0tYWQtaG9jIGd1aWxl IGd1aWxlLXNkbCAtRSBndWlsZQorZ3VpeCBlbnZpcm9ubWVudCAtLWFkLWhvYyBndWlsZSBndWls ZS1zZGwgLS0gZ3VpbGUKIEBlbmQgZXhhbXBsZQogCiBydW5zIEBjb21tYW5ke2d1aWxlfSBpbiBh biBlbnZpcm9ubWVudCB3aGVyZSBHdWlsZSBhbmQgR3VpbGUtU0RMIGFyZQpkaWZmIC0tZ2l0IGEv Z3VpeC9zY3JpcHRzL2Vudmlyb25tZW50LnNjbSBiL2d1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5z Y20KaW5kZXggN2FhNTJlOC4uZDM1YWIxOCAxMDA2NDQKLS0tIGEvZ3VpeC9zY3JpcHRzL2Vudmly b25tZW50LnNjbQorKysgYi9ndWl4L3NjcmlwdHMvZW52aXJvbm1lbnQuc2NtCkBAIC01Nyw2ICs1 Nyw5IEBAIE9VVFBVVCkgdHVwbGVzLiIKIChkZWZpbmUgJXByZWNpb3VzLXZhcmlhYmxlcwogICAn KCJIT01FIiAiVVNFUiIgIkxPR05BTUUiICJESVNQTEFZIiAiVEVSTSIgIlRaIiAiUEFHRVIiKSkK IAorKGRlZmluZSAlZGVmYXVsdC1zaGVsbAorICAob3IgKGdldGVudiAiU0hFTEwiKSAiL2Jpbi9z aCIpKQorCiAoZGVmaW5lIChwdXJpZnktZW52aXJvbm1lbnQpCiAgICJVbnNldCBhbG1vc3QgYWxs IGVudmlyb25tZW50IHZhcmlhYmxlcy4gIEEgc21hbGwgbnVtYmVyIG9mIHZhcmlhYmxlcyBzdWNo CiBhcyAnSE9NRScgYW5kICdVU0VSJyBhcmUgbGVmdCB1bnRvdWNoZWQuIgpAQCAtMTAzLDkgKzEw Niw5IEBAIGV4aXN0aW5nIGVudmlyb25tZW50IHZhcmlhYmxlcyB3aXRoIGFkZGl0aW9uYWwgc2Vh cmNoIHBhdGhzLiIKICAgICAsQChwYWNrYWdlLXRyYW5zaXRpdmUtcHJvcGFnYXRlZC1pbnB1dHMg cGFja2FnZSkpKQogCiAoZGVmaW5lIChzaG93LWhlbHApCi0gIChkaXNwbGF5IChfICJVc2FnZTog Z3VpeCBlbnZpcm9ubWVudCBbT1BUSU9OXS4uLiBQQUNLQUdFLi4uCi1CdWlsZCBhbiBlbnZpcm9u bWVudCB0aGF0IGluY2x1ZGVzIHRoZSBkZXBlbmRlbmNpZXMgb2YgUEFDS0FHRSBhbmQgZXhlY3V0 ZSBhCi1zaGVsbCBjb21tYW5kIGluIHRoYXQgZW52aXJvbm1lbnQuXG4iKSkKKyAgKGRpc3BsYXkg KF8gIlVzYWdlOiBndWl4IGVudmlyb25tZW50IFtPUFRJT05dLi4uIFBBQ0tBR0UuLi4gWy0tIENP TU1BTkQuLi5dCitCdWlsZCBhbiBlbnZpcm9ubWVudCB0aGF0IGluY2x1ZGVzIHRoZSBkZXBlbmRl bmNpZXMgb2YgUEFDS0FHRSBhbmQgZXhlY3V0ZQorQ09NTUFORCBvciBhbiBpbnRlcmFjdGl2ZSBz aGVsbCBpbiB0aGF0IGVudmlyb25tZW50LlxuIikpCiAgIChkaXNwbGF5IChfICIKICAgLWUsIC0t ZXhwcmVzc2lvbj1FWFBSICBjcmVhdGUgZW52aXJvbm1lbnQgZm9yIHRoZSBwYWNrYWdlIHRoYXQg RVhQUgogICAgICAgICAgICAgICAgICAgICAgICAgIGV2YWx1YXRlcyB0byIpKQpAQCAtMTEzLDgg KzExNiw2IEBAIHNoZWxsIGNvbW1hbmQgaW4gdGhhdCBlbnZpcm9ubWVudC5cbiIpKQogICAtbCwg LS1sb2FkPUZJTEUgICAgICAgIGNyZWF0ZSBlbnZpcm9ubWVudCBmb3IgdGhlIHBhY2thZ2UgdGhh dCB0aGUgY29kZSB3aXRoaW4KICAgICAgICAgICAgICAgICAgICAgICAgICBGSUxFIGV2YWx1YXRl cyB0byIpKQogICAoZGlzcGxheSAoXyAiCi0gIC1FLCAtLWV4ZWM9Q09NTUFORCAgICAgZXhlY3V0 ZSBDT01NQU5EIGluIG5ldyBlbnZpcm9ubWVudCIpKQotICAoZGlzcGxheSAoXyAiCiAgICAgICAt LWFkLWhvYyAgICAgICAgICAgaW5jbHVkZSBhbGwgc3BlY2lmaWVkIHBhY2thZ2VzIGluIHRoZSBl bnZpcm9ubWVudCBpbnN0ZWFkCiAgICAgICAgICAgICAgICAgICAgICAgICAgb2Ygb25seSB0aGVp ciBpbnB1dHMiKSkKICAgKGRpc3BsYXkgKF8gIgpAQCAtMTM1LDcgKzEzNiw3IEBAIHNoZWxsIGNv bW1hbmQgaW4gdGhhdCBlbnZpcm9ubWVudC5cbiIpKQogCiAoZGVmaW5lICVkZWZhdWx0LW9wdGlv bnMKICAgOzsgRGVmYXVsdCB0byBvcGVuaW5nIGEgbmV3IHNoZWxsLgotICBgKChleGVjIC4gLChv ciAoZ2V0ZW52ICJTSEVMTCIpICIvYmluL3NoIikpCisgIGAoKGV4ZWMgLiAoLCVkZWZhdWx0LXNo ZWxsKSkKICAgICAoc3lzdGVtIC4gLCglY3VycmVudC1zeXN0ZW0pKQogICAgIChzdWJzdGl0dXRl cz8gLiAjdCkKICAgICAobWF4LXNpbGVudC10aW1lIC4gMzYwMCkKQEAgLTE1NSw3ICsxNTYsNyBA QCBzaGVsbCBjb21tYW5kIGluIHRoYXQgZW52aXJvbm1lbnQuXG4iKSkKICAgICAgICAgICAgICAg ICAgICAoYWxpc3QtY29ucyAncHVyZSAjdCByZXN1bHQpKSkKICAgICAgICAgIChvcHRpb24gJygj XEUgImV4ZWMiKSAjdCAjZgogICAgICAgICAgICAgICAgICAobGFtYmRhIChvcHQgbmFtZSBhcmcg cmVzdWx0KQotICAgICAgICAgICAgICAgICAgIChhbGlzdC1jb25zICdleGVjIGFyZyByZXN1bHQp KSkKKyAgICAgICAgICAgICAgICAgICAoYWxpc3QtY29ucyAnZXhlYyAobGlzdCAlZGVmYXVsdC1z aGVsbCAiLWMiIGFyZykgcmVzdWx0KSkpCiAgICAgICAgICAob3B0aW9uICcoInNlYXJjaC1wYXRo cyIpICNmICNmCiAgICAgICAgICAgICAgICAgIChsYW1iZGEgKG9wdCBuYW1lIGFyZyByZXN1bHQp CiAgICAgICAgICAgICAgICAgICAgKGFsaXN0LWNvbnMgJ3NlYXJjaC1wYXRocyAjdCByZXN1bHQp KSkKQEAgLTIzMCwxNCArMjMxLDI0IEBAIE9VVFBVVCkgdHVwbGVzLCB1c2luZyB0aGUgYnVpbGQg b3B0aW9ucyBpbiBPUFRTLiIKICAgICAgICAgICAgICAgIChidWlsdC1kZXJpdmF0aW9ucyBkZXJp dmF0aW9ucykKICAgICAgICAgICAgICAgIChyZXR1cm4gZGVyaXZhdGlvbnMpKSkpKSkpKQogCi07 OyBFbnRyeSBwb2ludC4KLShkZWZpbmUgKGd1aXgtZW52aXJvbm1lbnQgLiBhcmdzKQorKGRlZmlu ZSAocGFyc2UtYXJncyBhcmdzKQorICAiUGFyc2UgdGhlIGxpc3Qgb2YgY29tbWFuZCBsaW5lIGFy Z3VtZW50cyBBUkdTLiIKICAgKGRlZmluZSAoaGFuZGxlLWFyZ3VtZW50IGFyZyByZXN1bHQpCiAg ICAgKGFsaXN0LWNvbnMgJ3BhY2thZ2UgYXJnIHJlc3VsdCkpCiAKKyAgOzsgVGhlICctLScgdG9r ZW4gaXMgdXNlZCB0byBzZXBhcmF0ZSB0aGUgY29tbWFuZCB0byBydW4gZnJvbSB0aGUgcmVzdCBv ZgorICA7OyB0aGUgb3BlcmFuZHMuCisgIChsZXQtdmFsdWVzICgoKGFyZ3MgY29tbWFuZCkgKHNw bGl0IGFyZ3MgIi0tIikpKQorICAgIChsZXQgKChvcHRzIChwYXJzZS1jb21tYW5kLWxpbmUgYXJn cyAlb3B0aW9ucyAobGlzdCAlZGVmYXVsdC1vcHRpb25zKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIzphcmd1bWVudC1oYW5kbGVyIGhhbmRsZS1hcmd1bWVudCkpKQorICAg ICAgKGlmIChudWxsPyBjb21tYW5kKQorICAgICAgICAgIG9wdHMKKyAgICAgICAgICAoYWxpc3Qt Y29ucyAnZXhlYyBjb21tYW5kIG9wdHMpKSkpKQorCis7OyBFbnRyeSBwb2ludC4KKyhkZWZpbmUg KGd1aXgtZW52aXJvbm1lbnQgLiBhcmdzKQogICAod2l0aC1lcnJvci1oYW5kbGluZwotICAgIChs ZXQqICgob3B0cyAgICAgKHBhcnNlLWNvbW1hbmQtbGluZSBhcmdzICVvcHRpb25zIChsaXN0ICVk ZWZhdWx0LW9wdGlvbnMpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICM6YXJndW1lbnQtaGFuZGxlciBoYW5kbGUtYXJndW1lbnQpKQorICAgIChsZXQqICgob3B0cyAg ICAgKHBhcnNlLWFyZ3MgYXJncykpCiAgICAgICAgICAgIChwdXJlPyAgICAoYXNzb2MtcmVmIG9w dHMgJ3B1cmUpKQogICAgICAgICAgICAoYWQtaG9jPyAgKGFzc29jLXJlZiBvcHRzICdhZC1ob2M/ KSkKICAgICAgICAgICAgKGNvbW1hbmQgIChhc3NvYy1yZWYgb3B0cyAnZXhlYykpCkBAIC0yODIs NCArMjkzLDcgQEAgT1VUUFVUKSB0dXBsZXMsIHVzaW5nIHRoZSBidWlsZCBvcHRpb25zIGluIE9Q VFMuIgogICAgICAgICAgICAgICAgICAgICAgKHJldHVybiAjdCkpCiAgICAgICAgICAgICAgICAg ICAgIChlbHNlCiAgICAgICAgICAgICAgICAgICAgICAoY3JlYXRlLWVudmlyb25tZW50IGlucHV0 cyBwYXRocyBwdXJlPykKLSAgICAgICAgICAgICAgICAgICAgIChyZXR1cm4gKGV4aXQgKHN0YXR1 czpleGl0LXZhbCAoc3lzdGVtIGNvbW1hbmQpKSkpKSkpKSkpKSkpCisgICAgICAgICAgICAgICAg ICAgICAocmV0dXJuCisgICAgICAgICAgICAgICAgICAgICAgKGV4aXQKKyAgICAgICAgICAgICAg ICAgICAgICAgKHN0YXR1czpleGl0LXZhbAorICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGx5 IHN5c3RlbSogY29tbWFuZCkpKSkpKSkpKSkpKSkKZGlmZiAtLWdpdCBhL2d1aXgvdXRpbHMuc2Nt IGIvZ3VpeC91dGlscy5zY20KaW5kZXggMWQ0YjJmZi4uMDcwZjgwNCAxMDA2NDQKLS0tIGEvZ3Vp eC91dGlscy5zY20KKysrIGIvZ3VpeC91dGlscy5zY20KQEAgLTc5LDYgKzc5LDcgQEAKICAgICAg ICAgICAgIGZvbGQyCiAgICAgICAgICAgICBmb2xkLXRyZWUKICAgICAgICAgICAgIGZvbGQtdHJl ZS1sZWF2ZXMKKyAgICAgICAgICAgIHNwbGl0CiAKICAgICAgICAgICAgIGZpbHRlcmVkLXBvcnQK ICAgICAgICAgICAgIGNvbXByZXNzZWQtcG9ydApAQCAtNjg0LDYgKzY4NSwyMyBAQCBhcmUgY29u bmVjdGVkIHRvIE5PREUgaW4gdGhlIHRyZWUsIG9yICcoKSBvciAjZiBpZiBOT0RFIGlzIGEgbGVh ZiBub2RlLiIKICAgICAgICAoZWxzZSByZXN1bHQpKSkKICAgIGluaXQgY2hpbGRyZW4gcm9vdHMp KQogCisoZGVmaW5lIChzcGxpdCBsc3QgZSkKKyAgIlJldHVybiB0d28gdmFsdWVzLCBhIGxpc3Qg Y29udGFpbmluZyB0aGUgZWxlbWVudHMgb2YgdGhlIGxpc3QgTFNUIHRoYXQKK2FwcGVhciBiZWZv cmUgdGhlIGZpcnN0IG9jY3VyZW5jZSBvZiB0aGUgb2JqZWN0IEUgYW5kIGEgbGlzdCBjb250YWlu aW5nIHRoZQorZWxlbWVudHMgYWZ0ZXIgRS4iCisgIChkZWZpbmUgKHNhbWU/IHgpCisgICAgKGVx dWFsPyBlIHgpKQorCisgIChsZXQgbG9vcCAoKHJlc3QgbHN0KQorICAgICAgICAgICAgIChhY2Mg JygpKSkKKyAgICAobWF0Y2ggcmVzdAorICAgICAgKCgpCisgICAgICAgKHZhbHVlcyBsc3QgJygp KSkKKyAgICAgICgoKD8gc2FtZT8pIC4gdGFpbCkKKyAgICAgICAodmFsdWVzIChyZXZlcnNlIGFj YykgdGFpbCkpCisgICAgICAoKGhlYWQgLiB0YWlsKQorICAgICAgIChsb29wIHRhaWwgKGNvbnMg aGVhZCBhY2MpKSkpKSkKKwogDAogOzs7CiA7OzsgU291cmNlIGxvY2F0aW9uLgpkaWZmIC0tZ2l0 IGEvdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC5zaCBiL3Rlc3RzL2d1aXgtZW52aXJvbm1lbnQuc2gK aW5kZXggMzJmYWY3MS4uMjc5NjkyZiAxMDA2NDQKLS0tIGEvdGVzdHMvZ3VpeC1lbnZpcm9ubWVu dC5zaAorKysgYi90ZXN0cy9ndWl4LWVudmlyb25tZW50LnNoCkBAIC00MCw3ICs0MCw3IEBAIHRl c3QgImB3YyAtbCA8ICIkdG1wZGlyL2EiYCIgPSAxCiBjbXAgIiR0bXBkaXIvYSIgIiR0bXBkaXIv YiIKIAogIyBNYWtlIHN1cmUgdGhlIGV4aXQgdmFsdWUgaXMgcHJlc2VydmVkLgotaWYgZ3VpeCBl bnZpcm9ubWVudCAtLWFkLWhvYyBndWlsZS1ib290c3RyYXAgLS1wdXJlIC1FICdndWlsZSAtYyAi KGV4aXQgNDIpIicKK2lmIGd1aXggZW52aXJvbm1lbnQgLS1hZC1ob2MgZ3VpbGUtYm9vdHN0cmFw IC0tcHVyZSAtLSBndWlsZSAtYyAnKGV4aXQgNDIpJwogdGhlbgogICAgIGZhbHNlCiBlbHNlCkBA IC02Niw3ICs2Niw3IEBAIHRoZW4KICAgICAjIGFzIHJldHVybmVkIGJ5ICctLXNlYXJjaC1wYXRo cycuCiAgICAgZ3VpeCBlbnZpcm9ubWVudCAtZSAnKEBAIChnbnUgcGFja2FnZXMgY29tbWVuY2Vt ZW50KSBnbnUtbWFrZS1ib290MCknCVwKIAkgLS1uby1zdWJzdGl0dXRlcyAtLXB1cmUJCQkJCQlc Ci0gICAgICAgICAtLWV4ZWM9J2VjaG8gJFBBVEggJENQQVRIICRMSUJSQVJZX1BBVEgnID4gIiR0 bXBkaXIvYiIKKyAgICAgICAgIC0tIC9iaW4vc2ggLWMgJ2VjaG8gJFBBVEggJENQQVRIICRMSUJS QVJZX1BBVEgnID4gIiR0bXBkaXIvYiIKICAgICAoIC4gIiR0bXBkaXIvYSIgOyBlY2hvICRQQVRI ICRDUEFUSCAkTElCUkFSWV9QQVRIICkgPiAiJHRtcGRpci9jIgogICAgIGNtcCAiJHRtcGRpci9i IiAiJHRtcGRpci9jIgogCmRpZmYgLS1naXQgYS90ZXN0cy91dGlscy5zY20gYi90ZXN0cy91dGls cy5zY20KaW5kZXggMTE1ODY4Yy4uYjY1ZDZkMiAxMDA2NDQKLS0tIGEvdGVzdHMvdXRpbHMuc2Nt CisrKyBiL3Rlc3RzL3V0aWxzLnNjbQpAQCAtMTIxLDYgKzEyMSwyMCBAQAogICAgICAgICAgICAg ICAgJygwIDEgMiAzKSkpCiAgICAgbGlzdCkpCiAKKyh0ZXN0LWVxdWFsICJzcGxpdCwgZWxlbWVu dCBpcyBpbiBsaXN0IgorICAnKChmb28pIChiYXopKQorICAoY2FsbC13aXRoLXZhbHVlcworICAg ICAgKGxhbWJkYSAoKQorICAgICAgICAoc3BsaXQgJyhmb28gYmFyIGJheikgJ2JhcikpCisgICAg bGlzdCkpCisKKyh0ZXN0LWVxdWFsICJzcGxpdCwgZWxlbWVudCBpcyBub3QgaW4gbGlzdCIKKyAg JygoZm9vIGJhciBiYXopICgpKQorICAoY2FsbC13aXRoLXZhbHVlcworICAgICAgKGxhbWJkYSAo KQorICAgICAgICAoc3BsaXQgJyhmb28gYmFyIGJheikgJ3F1dXgpKQorICAgIGxpc3QpKQorCiAo dGVzdC1lcXVhbCAic3RyaXAta2V5d29yZC1hcmd1bWVudHMiCiAgICcoYSAjOmIgYiAjOmMgYykK ICAgKHN0cmlwLWtleXdvcmQtYXJndW1lbnRzICcoIzpmb28gIzpiYXIgIzpiYXopCi0tIAoyLjUu MAoK --94eb2c0550fed16ae40521a1e98a--