From unknown Fri Apr 17 13:28:48 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#469: Move pre and post scripts to common code and add scripts in select session Reply-To: Josh Lukens , 469@bugs.x2go.org Resent-From: Josh Lukens Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Wed, 02 Apr 2014 13:30:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: report 469 X-X2Go-PR-Package: x2gobroker X-X2Go-PR-Keywords: Received: via spool by submit@bugs.x2go.org id=B.13964451293385 (code B); Wed, 02 Apr 2014 13:30:02 +0000 Received: (at submit) by bugs.x2go.org; 2 Apr 2014 13:25:29 +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=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_BLOCKED autolearn=ham version=3.3.2 Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 594F05DB16 for ; Wed, 2 Apr 2014 15:25:28 +0200 (CEST) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id B44A31AC0C5 for ; Wed, 2 Apr 2014 09:25:26 -0400 (EDT) Date: Wed, 2 Apr 2014 09:25:25 -0400 From: Josh Lukens To: submit@bugs.x2go.org Message-ID: X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="533c0fc5_39386575_29a9" --533c0fc5_39386575_29a9 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2gobroker Version: 0.0.3.0 Severity: wishlist Move pre and post scripts to common code and add scripts in select session. --533c0fc5_39386575_29a9 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="x2gobroker-469.patch" ZGlmZiAtLWdpdCBhL2RlYmlhbi9jaGFuZ2Vsb2cgYi9kZWJpYW4vY2hhbmdlbG9nCmluZGV4IDE1 OTg4ZjAuLjUxOWNmMGEgMTAwNjQ0Ci0tLSBhL2RlYmlhbi9jaGFuZ2Vsb2cKKysrIGIvZGViaWFu L2NoYW5nZWxvZwpAQCAtMTQ5LDYgKzE0OSw4IEBAIHgyZ29icm9rZXIgKDAuMC4zLjAtMHgyZ28x KSBVTlJFTEVBU0VEOyB1cmdlbmN5PWxvdwogICAgICAgKEZpeGVzOiAjNDQ3KS4KICAgICAtIEFk ZCBzdXBwb3J0IHRvIHJ1biBwcmUgYW5kIHBvc3QgYXV0aGVudGljYXRpb24gc2NyaXB0cy4gKEZp eGVzOiAjNDQ5KS4KICAgICAtIEFkZCBhdXRoIG1lY2hhbmlzbSBodHRwc19nZXQuIChGaXhlczog IzQ1MCkuCisgICAgLSBDaGFuZ2UgcHJlIGFuZCBwb3N0IHNjcmlwdHMgdG8gdXNlIGNvbW1vbiBj b2RlYmFzZSBhY3Jvc3MgZnJvbnRlbmRzIChGaXhlczogIzQ2OSkKKyAgICAtIEFkZCBhYmlsaXR5 IHRvIGhhdmUgc2NyaXB0IHJ1biBpbiBzZWxlY3Qgc2Vzc2lvbiBhZnRlciBzZXJ2ZXIgaXMgc2Vs ZWN0ZWQgCiAKICAtLSBNaWtlIEdhYnJpZWwgPG1pa2UuZ2FicmllbEBkYXMtbmV0endlcmt0ZWFt LmRlPiAgRnJpLCAwNyBKdW4gMjAxMyAyMzoyNTozMCArMDIwMAogCmRpZmYgLS1naXQgYS9ldGMv eDJnb2Jyb2tlci5jb25mIGIvZXRjL3gyZ29icm9rZXIuY29uZgppbmRleCAxMGRmMGM0Li43MWNi NjlhIDEwMDY0NAotLS0gYS9ldGMveDJnb2Jyb2tlci5jb25mCisrKyBiL2V0Yy94MmdvYnJva2Vy LmNvbmYKQEAgLTUwLDEwICs1MCwxNCBAQAogCiAjIFByZSBhbmQgUG9zdCBhdXRoZW50aWNhdGlv biBzY3JpcHRzIGdpdmUgeW91IHRoZSBvcHRpb24gdG8gcnVuIG91dHNpZGUgc2NyaXB0cwogIyBv ciBhZGp1c3QgdGhlIHZhbHVlcyBvZiB2YXJpYWJsZXMgZm9yIHVzZXJzIGxvZ2dpbmcgaW4uICBQ cmUgc2NyaXB0cyBydW4ganVzdAotIyBiZWZvcmUgdXNlciBhdXRoZW50aWNhdGlvbiBhbmQgUG9z dCBzY3JpcHRzIHJ1biBqdXN0IGFmdGVyLiAgU2V0IHRvIGxpc3Qgb2YKLSMgc2NyaXB0cywgY29t bWEgc2VwZXJhdGVkLCB3aXRoIG5vIHNwYWNlcyBiZXR3ZWVuLgorIyBiZWZvcmUgdXNlciBhdXRo ZW50aWNhdGlvbiBhbmQgUG9zdCBzY3JpcHRzIHJ1biBqdXN0IGFmdGVyIGV2ZW4gaWYgYXV0aGVu dGljYXRpb24gZmFpbHMuCisjIFNlbGVjdCBTZXNzaW9uIHNjcmlwdHMgcnVuIGFmdGVyIGxvYWQg YmFsbmNpbmcgcmlnaHQgYmVmb3JlIHRoZSBjaG9zZW4gc2VydmVyIGlzIHNlbnQKKyMgdG8gdGhl IGNsaWVudC4KKyMKKyMgU2V0IHRvIGxpc3Qgb2Ygc2NyaXB0cywgY29tbWEgc2VwZXJhdGVkLCB3 aXRoIG5vIHNwYWNlcyBiZXR3ZWVuLgogI3ByZV9hdXRoX3NjcmlwdHMgPQogI3Bvc3RfYXV0aF9z Y3JpcHRzID0KKyNzZWxlY3Rfc2Vzc2lvbl9zY3JpcHRzID0KIAogIyBFdmVyeSBzZXJ2ZXItY2xp ZW50IGNvbW11bmljYXRpb24gKGJldHdlZW4gWDJHbyBDbGllbnQgYW5kIGJyb2tlcikgaGFzIHRv IGJlCiAjIGFjY29tcGFuaWVkIGJ5IHRoaXMgaW5pdGlhbCBhdXRoZW50aWNhdGlvbiBjb29raWUg aWYgcmVxdWlyZS1jb29raWUgaXMgc2V0IGFib3ZlLgpkaWZmIC0tZ2l0IGEveDJnb2Jyb2tlci9i cm9rZXJzL2Jhc2VfYnJva2VyLnB5IGIveDJnb2Jyb2tlci9icm9rZXJzL2Jhc2VfYnJva2VyLnB5 CmluZGV4IDJiMWNkZjQuLjU1NGMyNzAgMTAwNjQ0Ci0tLSBhL3gyZ29icm9rZXIvYnJva2Vycy9i YXNlX2Jyb2tlci5weQorKysgYi94MmdvYnJva2VyL2Jyb2tlcnMvYmFzZV9icm9rZXIucHkKQEAg LTExNDIsMyArMTE0MiwyNyBAQCBjbGFzcyBYMkdvQnJva2VyKG9iamVjdCk6CiAKICAgICAgICAg IiIiCiAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgZGVmIHJ1bl9vcHRpb25hbF9zY3JpcHQo c2VsZiwgc2NyaXB0X3R5cGUsIHVzZXJuYW1lLCBwYXNzd29yZCwgdGFzaywgcHJvZmlsZV9pZCwg aXAsIGNvb2tpZSwgYXV0aGVkPU5vbmUsIHNlcnZlcj1Ob25lKToKKyAgICAgICAgIiIiXAorICAg ICAgICBSdW4gYWxsIG9wdGlvbmFsIHNjcmlwdHMgb2YgdHlwZSBzY3JpcHRfdHlwZS4gIENhbGxl ZCB3aXRoIDMgZGlmZmVyZW50IHNjcmlwdCB0eXBlczoKKyAgICAgICAgICBwcmVfYXV0aF9zY3Jp cHRzIC0gYmVmb3JlIGF1dGhlbnRpY2F0aW9uIGhhcHBlbnMKKyAgICAgICAgICBwb3N0X2F1dGhf c2NyaXB0cyAtIGFmdGVyIGF1dGhlbnRpY2F0aW9uIGJ1dCBiZWZvcmUgYW55dGhpbmcgZWxzZSBv Y2N1cnMKKyAgICAgICAgICBzZWxlY3Rfc2Vzc2lvbl9zY3JpcHRzIC0gYWZ0ZXIgbG9hZCBiYWxh bmNpbmcgYmVmb3JlIGEgc3BlY2lmaWMgc2VydmVyIGlzIHNlbnQgdG8gdGhlIGNsaWVudAorCisg ICAgICAgIFRoZXNlIHNjcmlwdHMgYWxsb3cgZm9yIGJvdGggYWRkaW9uYWwgYWN0aW9ucyB0byBi ZSBwZXJmb3JtZWQgYXMgd2VsbCBhcyB0aGUgbWFuZ2xpbmcgb2YgYW55IHJlbGV2YW50IGZpZWxk cy4KKyAgICAgICAgCisgICAgICAgICIiIgorCisgICAgICAgIGlmIGxlbihnbG9iYWxfY29uZmln W3NjcmlwdF90eXBlXSkgIT0gMDoKKyAgICAgICAgICAgIGZvciBzY3JpcHQgaW4gZ2xvYmFsX2Nv bmZpZ1tzY3JpcHRfdHlwZV06CisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAg ICAgICBteV9zY3JpcHQ9Tm9uZQorICAgICAgICAgICAgICAgICAgICBleGVjKCJpbXBvcnQgeDJn b2Jyb2tlci5vcHRpb25hbF9zY3JpcHRzLntzY3JpcHR9X3NjcmlwdCIuZm9ybWF0KHNjcmlwdD1z Y3JpcHQpKQorICAgICAgICAgICAgICAgICAgICBleGVjKCJteV9zY3JpcHQgPSB4MmdvYnJva2Vy Lm9wdGlvbmFsX3NjcmlwdHMue3NjcmlwdH1fc2NyaXB0LlgyR29Ccm9rZXJPcHRpb25hbFNjcmlw dCgpIi5mb3JtYXQoc2NyaXB0PXNjcmlwdCkpCisgICAgICAgICAgICAgICAgICAgIGxvZ2dlcl9i cm9rZXIuZGVidWcgKCdDYWxsaW5nIHtzY3JpcHRfdHlwZX0ge3NjcmlwdH0gd2l0aCB1c2VybmFt ZToge3VzZXJuYW1lfSwgcGFzc3dvcmQ6IHtwYXNzd29yZH0sIHRhc2s6IHt0YXNrfSwgcHJvZmls ZV9pZDoge3Byb2ZpbGVfaWR9LCBpcDoge2lwfSwgY29va2llOiB7Y29va2llfSwgYXV0aGVkOiB7 YXV0aGVkfSwgc2VydmVyOiB7c2VydmVyfScuZm9ybWF0KHNjcmlwdF90eXBlPXNjcmlwdF90eXBl LHNjcmlwdD1zY3JpcHQsdXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPSdYWFhYWCcsIHRhc2s9 dGFzaywgcHJvZmlsZV9pZD1wcm9maWxlX2lkLCBpcD1pcCwgY29va2llPWNvb2tpZSwgYXV0aGVk PWF1dGhlZCwgc2VydmVyPXNlcnZlcikpCisgICAgICAgICAgICAgICAgICAgIHVzZXJuYW1lLCBw YXNzd29yZCwgdGFzaywgcHJvZmlsZV9pZCwgaXAsIGNvb2tpZSwgYXV0aGVkLCBzZXJ2ZXIgPSBt eV9zY3JpcHQucnVuX21lKHVzZXJuYW1lPXVzZXJuYW1lLCBwYXNzd29yZD1wYXNzd29yZCwgdGFz az10YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQsIGlwPWlwLCBjb29raWU9Y29va2llLCBhdXRo ZWQ9YXV0aGVkLCBzZXJ2ZXI9c2VydmVyKQorICAgICAgICAgICAgICAgICAgICBsb2dnZXJfYnJv a2VyLmRlYnVnICgnRmluaXNoZWQge3NjcmlwdF90eXBlfSB7c2NyaXB0fSB3aXRoIHVzZXJuYW1l OiB7dXNlcm5hbWV9LCBwYXNzd29yZDoge3Bhc3N3b3JkfSwgdGFzazoge3Rhc2t9LCBwcm9maWxl X2lkOiB7cHJvZmlsZV9pZH0sIGlwOiB7aXB9LCBjb29raWU6IHtjb29raWV9LCBhdXRoZWQ6IHth dXRoZWR9LCBzZXJ2ZXI6IHtzZXJ2ZXJ9Jy5mb3JtYXQoc2NyaXB0X3R5cGU9c2NyaXB0X3R5cGUs c2NyaXB0PXNjcmlwdCx1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9J1hYWFhYJywgdGFzaz10 YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQsIGlwPWlwLCBjb29raWU9Y29va2llLCBhdXRoZWQ9 YXV0aGVkLCBzZXJ2ZXI9c2VydmVyKSkKKyAgICAgICAgICAgICAgICBleGNlcHQgSW1wb3J0RXJy b3I6CisgICAgICAgICAgICAgICAgICAgIGxvZ2dlcl9lcnJvci5lcnJvcignTm8gc3VjaCBvcHRp b25hbCBzY3JpcHQgXCd7c2NyaXB0fVwnJy5mb3JtYXQoc2NyaXB0PXNjcmlwdCkpCisgICAgICAg IHJldHVybiB1c2VybmFtZSwgcGFzc3dvcmQsIHRhc2ssIHByb2ZpbGVfaWQsIGlwLCBjb29raWUs IGF1dGhlZCwgc2VydmVyCmRpZmYgLS1naXQgYS94MmdvYnJva2VyL2RlZmF1bHRzLnB5IGIveDJn b2Jyb2tlci9kZWZhdWx0cy5weQppbmRleCAwY2RjMzIzLi41YWU5Y2NiIDEwMDY0NAotLS0gYS94 MmdvYnJva2VyL2RlZmF1bHRzLnB5CisrKyBiL3gyZ29icm9rZXIvZGVmYXVsdHMucHkKQEAgLTE4 OCw2ICsxODgsNyBAQCBYMkdPQlJPS0VSX0NPTkZJR19ERUZBVUxUUyA9IHsKICAgICAgICAgdSd2 ZXJpZnktaXAnOiBUcnVlLAogICAgICAgICB1J3ByZV9hdXRoX3NjcmlwdHMnOiBbXSwKICAgICAg ICAgdSdwb3N0X2F1dGhfc2NyaXB0cyc6IFtdLAorICAgICAgICB1J3NlbGVjdF9zZXNzaW9uX3Nj cmlwdHMnOiBbXSwKICAgICAgICAgdSdteS1jb29raWUnOiB1dWlkLnV1aWQ0KCksCiAgICAgICAg IHUnZW5hYmxlLXBsYWluLW91dHB1dCc6IFRydWUsCiAgICAgICAgIHUnZW5hYmxlLWpzb24tb3V0 cHV0JzogVHJ1ZSwKZGlmZiAtLWdpdCBhL3gyZ29icm9rZXIvb3B0aW9uYWxfc2NyaXB0cy9iYXNl X3NjcmlwdC5weSBiL3gyZ29icm9rZXIvb3B0aW9uYWxfc2NyaXB0cy9iYXNlX3NjcmlwdC5weQpp bmRleCBlMjg0MzYyLi5kZDllNWUyIDEwMDc1NQotLS0gYS94MmdvYnJva2VyL29wdGlvbmFsX3Nj cmlwdHMvYmFzZV9zY3JpcHQucHkKKysrIGIveDJnb2Jyb2tlci9vcHRpb25hbF9zY3JpcHRzL2Jh c2Vfc2NyaXB0LnB5CkBAIC0yMCw1ICsyMCw1IEBACiAKIGNsYXNzIFgyR29Ccm9rZXJPcHRpb25h bFNjcmlwdChvYmplY3QpOgogCi0gICAgZGVmIHJ1bl9tZShzZWxmLCB1c2VybmFtZSwgcGFzc3dv cmQsIHRhc2ssIHByb2ZpbGVfaWQsIGlwLCBjb29raWUpOgotICAgICAgICByZXR1cm4gdXNlcm5h bWUsIHBhc3N3b3JkLCB0YXNrLCBwcm9maWxlX2lkLCBpcCwgY29va2llCisgICAgZGVmIHJ1bl9t ZShzZWxmLCB1c2VybmFtZSwgcGFzc3dvcmQsIHRhc2ssIHByb2ZpbGVfaWQsIGlwLCBjb29raWUs IGF1dGhlZCwgc2VydmVyKToKKyAgICAgICAgcmV0dXJuIHVzZXJuYW1lLCBwYXNzd29yZCwgdGFz aywgcHJvZmlsZV9pZCwgaXAsIGNvb2tpZSwgYXV0aGVkLCBzZXJ2ZXIKZGlmZiAtLWdpdCBhL3gy Z29icm9rZXIvd2ViL2pzb24ucHkgYi94MmdvYnJva2VyL3dlYi9qc29uLnB5Cm9sZCBtb2RlIDEw MDY0NApuZXcgbW9kZSAxMDA3NTUKaW5kZXggMDhjYjk3My4uYjg4Y2E1ZAotLS0gYS94MmdvYnJv a2VyL3dlYi9qc29uLnB5CisrKyBiL3gyZ29icm9rZXIvd2ViL2pzb24ucHkKQEAgLTEyNSwyMSAr MTI1LDEzIEBAIGNsYXNzIFgyR29Ccm9rZXJXZWIoX1JlcXVlc3RIYW5kbGVyKToKICAgICAgICAg ICAgICd0YXNrJzogdGFzaywKICAgICAgICAgfQogCi0gICAgICAgIGlmIGxlbihnbG9iYWxfY29u ZmlnWydwcmVfYXV0aF9zY3JpcHRzJ10pICE9IDA6Ci0gICAgICAgICAgICBmb3Igc2NyaXB0IGlu IGdsb2JhbF9jb25maWdbJ3ByZV9hdXRoX3NjcmlwdHMnXToKLSAgICAgICAgICAgICAgICB0cnk6 Ci0gICAgICAgICAgICAgICAgICAgIHBvc3RfYXV0aF9zY3JpcHQ9Tm9uZQotICAgICAgICAgICAg ICAgICAgICBleGVjKCJpbXBvcnQgeDJnb2Jyb2tlci5vcHRpb25hbF9zY3JpcHRzLntzY3JpcHR9 X3NjcmlwdCIuZm9ybWF0KHNjcmlwdD1zY3JpcHQpKQotICAgICAgICAgICAgICAgICAgICBleGVj KCJwcmVfYXV0aF9zY3JpcHQgPSB4MmdvYnJva2VyLm9wdGlvbmFsX3NjcmlwdHMue3NjcmlwdH1f c2NyaXB0LlgyR29Ccm9rZXJPcHRpb25hbFNjcmlwdCgpIi5mb3JtYXQoc2NyaXB0PXNjcmlwdCkp Ci0gICAgICAgICAgICAgICAgICAgIGxvZ2dlcl9icm9rZXIuZGVidWcgKCdDYWxsaW5nIHByZS1h dXRoIHNjcmlwdCB7c2NyaXB0fSB3aXRoIHVzZXJuYW1lOiB7dXNlcm5hbWV9LCBwYXNzd29yZDog e3Bhc3N3b3JkfSwgdGFzazoge3Rhc2t9LCBwcm9maWxlX2lkOiB7cHJvZmlsZV9pZH0sIGlwOiB7 aXB9LCBjb29raWU6IHtjb29raWV9Jy5mb3JtYXQoc2NyaXB0PXNjcmlwdCx1c2VybmFtZT11c2Vy bmFtZSwgcGFzc3dvcmQ9J1hYWFhYJywgdGFzaz10YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQs IGlwPWlwLCBjb29raWU9Y29va2llKSkKLSAgICAgICAgICAgICAgICAgICAgdXNlcm5hbWUsIHBh c3N3b3JkLCB0YXNrLCBwcm9maWxlX2lkLCBpcCwgY29va2llID0gcHJlX2F1dGhfc2NyaXB0LnJ1 bl9tZSh1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9cGFzc3dvcmQsIHRhc2s9dGFzaywgcHJv ZmlsZV9pZD1wcm9maWxlX2lkLCBpcD1pcCwgY29va2llPWNvb2tpZSkKLSAgICAgICAgICAgICAg ICAgICAgbG9nZ2VyX2Jyb2tlci5kZWJ1ZyAoJ1ByZS1hdXRoIHNjcmlwdCB7c2NyaXB0fSBmaW5p c2hlZCB3aXRoIHVzZXJuYW1lOiB7dXNlcm5hbWV9LCBwYXNzd29yZDoge3Bhc3N3b3JkfSwgdGFz azoge3Rhc2t9LCBwcm9maWxlX2lkOiB7cHJvZmlsZV9pZH0sIGlwOiB7aXB9LCBjb29raWU6IHtj b29raWV9Jy5mb3JtYXQoc2NyaXB0PXNjcmlwdCx1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9 J1hYWFhYJywgdGFzaz10YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQsIGlwPWlwLCBjb29raWU9 Y29va2llKSkKLSAgICAgICAgICAgICAgICBleGNlcHQgSW1wb3J0RXJyb3I6Ci0gICAgICAgICAg ICAgICAgICAgIGxvZ2dlcl9lcnJvci5lcnJvcignTm8gc3VjaCBvcHRpb25hbCBzY3JpcHQgXCd7 c2NyaXB0fVwnJy5mb3JtYXQoc2NyaXB0PXNjcmlwdCkpCisgICAgICAgIHVzZXJuYW1lLCBwYXNz d29yZCwgdGFzaywgcHJvZmlsZV9pZCwgaXAsIGNvb2tpZSwgYXV0aGVkLCBzZXJ2ZXIgPSBicm9r ZXJfYmFja2VuZC5ydW5fb3B0aW9uYWxfc2NyaXB0KHNjcmlwdF90eXBlPSdwcmVfYXV0aF9zY3Jp cHRzJywgdXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0YXNrPXRhc2ssIHBy b2ZpbGVfaWQ9cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29raWUpCiAKICAgICAgICAgbG9n Z2VyX2Jyb2tlci5kZWJ1ZyAoJ3VzZXJuYW1lOiB7dXNlcm5hbWV9LCBwYXNzd29yZDoge3Bhc3N3 b3JkfSwgdGFzazoge3Rhc2t9LCBwcm9maWxlX2lkOiB7cHJvZmlsZV9pZH0sIGNvb2tpZToge2Nv b2tpZX0nLmZvcm1hdCh1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9J1hYWFhYJywgdGFzaz10 YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQsIGNvb2tpZT1jb29raWUpKQogICAgICAgICBhY2Nl c3MsIG5leHRfY29va2llID0gYnJva2VyX2JhY2tlbmQuY2hlY2tfYWNjZXNzKHVzZXJuYW1lPXVz ZXJuYW1lLCBwYXNzd29yZD1wYXNzd29yZCwgaXA9aXAsIGNvb2tpZT1jb29raWUpCiAKKyAgICAg ICAgdXNlcm5hbWUsIHBhc3N3b3JkLCB0YXNrLCBwcm9maWxlX2lkLCBpcCwgY29va2llLCBhdXRo ZWQsIHNlcnZlciA9IGJyb2tlcl9iYWNrZW5kLnJ1bl9vcHRpb25hbF9zY3JpcHQoc2NyaXB0X3R5 cGU9J3Bvc3RfYXV0aF9zY3JpcHRzJywgdXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3 b3JkLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29r aWUsIGF1dGhlZD1hY2Nlc3MpCisKICAgICAgICAgaWYgYWNjZXNzOgogCiAgICAgICAgICAgICBp ZiBsZW4oZ2xvYmFsX2NvbmZpZ1sncG9zdF9hdXRoX3NjcmlwdHMnXSkgIT0gMDoKQEAgLTE5OSw3 ICsxOTEsOCBAQCBjbGFzcyBYMkdvQnJva2VyV2ViKF9SZXF1ZXN0SGFuZGxlcik6CiAKICAgICAg ICAgICAgICAgICAgICAgcHJvZmlsZV9pbmZvID0gYnJva2VyX2JhY2tlbmQuc2VsZWN0X3Nlc3Np b24ocHJvZmlsZV9pZD1wcm9maWxlX2lkLCB1c2VybmFtZT11c2VybmFtZSwgcHVia2V5PXB1Ymtl eSkKICAgICAgICAgICAgICAgICAgICAgaWYgcHJvZmlsZV9pbmZvLmhhc19rZXkoJ3NlcnZlcicp OgotICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0ZWRfc2Vzc2lvblsnc2VydmVyJ10gPSAi e3NlcnZlcn0iLmZvcm1hdChzZXJ2ZXI9cHJvZmlsZV9pbmZvWydzZXJ2ZXInXSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCwgdGFzaywgcHJvZmlsZV9pZCwgaXAs IGNvb2tpZSwgYXV0aGVkLCBzZXJ2ZXIgPSBicm9rZXJfYmFja2VuZC5ydW5fb3B0aW9uYWxfc2Ny aXB0KHNjcmlwdF90eXBlPSdzZWxlY3Rfc2Vzc2lvbl9zY3JpcHRzJywgdXNlcm5hbWU9dXNlcm5h bWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmlsZV9pZCwg aXA9aXAsIGNvb2tpZT1jb29raWUsIGF1dGhlZD1hY2Nlc3MsIHNlcnZlcj1wcm9maWxlX2luZm9b J3NlcnZlciddKQorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0ZWRfc2Vzc2lvblsnc2Vy dmVyJ10gPSAie3NlcnZlcn0iLmZvcm1hdChzZXJ2ZXI9c2VydmVyKQogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgcHJvZmlsZV9pbmZvLmhhc19rZXkoJ3BvcnQnKToKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzZWxlY3RlZF9zZXNzaW9uWydwb3J0J10gPSAie3BvcnR9Ii5mb3JtYXQo cG9ydD1wcm9maWxlX2luZm9bJ3BvcnQnXSkKICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2U6 CmRpZmYgLS1naXQgYS94MmdvYnJva2VyL3dlYi9wbGFpbi5weSBiL3gyZ29icm9rZXIvd2ViL3Bs YWluLnB5Cm9sZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKaW5kZXggMTUwODE4Yi4uNTU3 MTYwYgotLS0gYS94MmdvYnJva2VyL3dlYi9wbGFpbi5weQorKysgYi94MmdvYnJva2VyL3dlYi9w bGFpbi5weQpAQCAtMTE0LDM1ICsxMTQsMTYgQEAgY2xhc3MgWDJHb0Jyb2tlcldlYihfUmVxdWVz dEhhbmRsZXIpOgogICAgICAgICBuZXdfcGFzc3dvcmQgPSBzZWxmLmdldF9hcmd1bWVudCgnbmV3 cGFzcycsIGRlZmF1bHQ9JycpCiAKICAgICAgICAgb3V0cHV0ID0gJycKLQotICAgICAgICBpZiBs ZW4oZ2xvYmFsX2NvbmZpZ1sncHJlX2F1dGhfc2NyaXB0cyddKSAhPSAwOgotICAgICAgICAgICAg Zm9yIHNjcmlwdCBpbiBnbG9iYWxfY29uZmlnWydwcmVfYXV0aF9zY3JpcHRzJ106Ci0gICAgICAg ICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgICAgICBwb3N0X2F1dGhfc2NyaXB0PU5vbmUK LSAgICAgICAgICAgICAgICAgICAgZXhlYygiaW1wb3J0IHgyZ29icm9rZXIub3B0aW9uYWxfc2Ny aXB0cy57c2NyaXB0fV9zY3JpcHQiLmZvcm1hdChzY3JpcHQ9c2NyaXB0KSkKLSAgICAgICAgICAg ICAgICAgICAgZXhlYygicHJlX2F1dGhfc2NyaXB0ID0geDJnb2Jyb2tlci5vcHRpb25hbF9zY3Jp cHRzLntzY3JpcHR9X3NjcmlwdC5YMkdvQnJva2VyT3B0aW9uYWxTY3JpcHQoKSIuZm9ybWF0KHNj cmlwdD1zY3JpcHQpKQotICAgICAgICAgICAgICAgICAgICBsb2dnZXJfYnJva2VyLmRlYnVnICgn Q2FsbGluZyBwcmUtYXV0aCBzY3JpcHQge3NjcmlwdH0gd2l0aCB1c2VybmFtZToge3VzZXJuYW1l fSwgcGFzc3dvcmQ6IHtwYXNzd29yZH0sIHRhc2s6IHt0YXNrfSwgcHJvZmlsZV9pZDoge3Byb2Zp bGVfaWR9LCBpcDoge2lwfSwgY29va2llOiB7Y29va2llfScuZm9ybWF0KHNjcmlwdD1zY3JpcHQs dXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPSdYWFhYWCcsIHRhc2s9dGFzaywgcHJvZmlsZV9p ZD1wcm9maWxlX2lkLCBpcD1pcCwgY29va2llPWNvb2tpZSkpCi0gICAgICAgICAgICAgICAgICAg IHVzZXJuYW1lLCBwYXNzd29yZCwgdGFzaywgcHJvZmlsZV9pZCwgaXAsIGNvb2tpZSA9IHByZV9h dXRoX3NjcmlwdC5ydW5fbWUodXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0 YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29raWUpCi0g ICAgICAgICAgICAgICAgICAgIGxvZ2dlcl9icm9rZXIuZGVidWcgKCdQcmUtYXV0aCBzY3JpcHQg e3NjcmlwdH0gZmluaXNoZWQgd2l0aCB1c2VybmFtZToge3VzZXJuYW1lfSwgcGFzc3dvcmQ6IHtw YXNzd29yZH0sIHRhc2s6IHt0YXNrfSwgcHJvZmlsZV9pZDoge3Byb2ZpbGVfaWR9LCBpcDoge2lw fSwgY29va2llOiB7Y29va2llfScuZm9ybWF0KHNjcmlwdD1zY3JpcHQsdXNlcm5hbWU9dXNlcm5h bWUsIHBhc3N3b3JkPSdYWFhYWCcsIHRhc2s9dGFzaywgcHJvZmlsZV9pZD1wcm9maWxlX2lkLCBp cD1pcCwgY29va2llPWNvb2tpZSkpCi0gICAgICAgICAgICAgICAgZXhjZXB0IEltcG9ydEVycm9y OgotICAgICAgICAgICAgICAgICAgICBsb2dnZXJfZXJyb3IuZXJyb3IoJ05vIHN1Y2ggb3B0aW9u YWwgc2NyaXB0IFwne3NjcmlwdH1cJycuZm9ybWF0KHNjcmlwdD1zY3JpcHQpKQorICAgICAgICAK KyAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkLCB0YXNrLCBwcm9maWxlX2lkLCBpcCwgY29va2ll LCBhdXRoZWQsIHNlcnZlciA9IGJyb2tlcl9iYWNrZW5kLnJ1bl9vcHRpb25hbF9zY3JpcHQoc2Ny aXB0X3R5cGU9J3ByZV9hdXRoX3NjcmlwdHMnLCB1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9 cGFzc3dvcmQsIHRhc2s9dGFzaywgcHJvZmlsZV9pZD1wcm9maWxlX2lkLCBpcD1pcCwgY29va2ll PWNvb2tpZSkKIAogICAgICAgICBsb2dnZXJfYnJva2VyLmRlYnVnICgndXNlcm5hbWU6IHt1c2Vy bmFtZX0sIHBhc3N3b3JkOiB7cGFzc3dvcmR9LCB0YXNrOiB7dGFza30sIHByb2ZpbGVfaWQ6IHtw cm9maWxlX2lkfSwgY29va2llOiB7Y29va2llfScuZm9ybWF0KHVzZXJuYW1lPXVzZXJuYW1lLCBw YXNzd29yZD0nWFhYWFgnLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmlsZV9pZCwgY29va2ll PWNvb2tpZSkpCiAgICAgICAgIGFjY2VzcywgbmV4dF9jb29raWUgPSBicm9rZXJfYmFja2VuZC5j aGVja19hY2Nlc3ModXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCBpcD1pcCwg Y29va2llPWNvb2tpZSkKIAotICAgICAgICBpZiBhY2Nlc3M6Ci0gICAgICAgICAgICBpZiBsZW4o Z2xvYmFsX2NvbmZpZ1sncG9zdF9hdXRoX3NjcmlwdHMnXSkgIT0gMDoKLSAgICAgICAgICAgICAg ICBmb3Igc2NyaXB0IGluIGdsb2JhbF9jb25maWdbJ3Bvc3RfYXV0aF9zY3JpcHRzJ106Ci0gICAg ICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAgICAgICAgIHBvc3RfYXV0aF9z Y3JpcHQ9Tm9uZQotICAgICAgICAgICAgICAgICAgICAgICAgZXhlYygiaW1wb3J0IHgyZ29icm9r ZXIub3B0aW9uYWxfc2NyaXB0cy57c2NyaXB0fV9zY3JpcHQiLmZvcm1hdChzY3JpcHQ9c2NyaXB0 KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGV4ZWMoInBvc3RfYXV0aF9zY3JpcHQgPSB4Mmdv YnJva2VyLm9wdGlvbmFsX3NjcmlwdHMue3NjcmlwdH1fc2NyaXB0LlgyR29Ccm9rZXJPcHRpb25h bFNjcmlwdCgpIi5mb3JtYXQoc2NyaXB0PXNjcmlwdCkpCi0gICAgICAgICAgICAgICAgICAgICAg ICBsb2dnZXJfYnJva2VyLmRlYnVnICgnQ2FsbGluZyBwb3N0LWF1dGggc2NyaXB0IHtzY3JpcHR9 IHdpdGggdXNlcm5hbWU6IHt1c2VybmFtZX0sIHBhc3N3b3JkOiB7cGFzc3dvcmR9LCB0YXNrOiB7 dGFza30sIHByb2ZpbGVfaWQ6IHtwcm9maWxlX2lkfSwgaXA6IHtpcH0sIGNvb2tpZToge2Nvb2tp ZX0nLmZvcm1hdChzY3JpcHQ9c2NyaXB0LHVzZXJuYW1lPXVzZXJuYW1lLCBwYXNzd29yZD0nWFhY WFgnLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29r aWUpKQotICAgICAgICAgICAgICAgICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkLCB0YXNrLCBw cm9maWxlX2lkLCBpcCwgY29va2llID0gcG9zdF9hdXRoX3NjcmlwdC5ydW5fbWUodXNlcm5hbWU9 dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9cHJvZmls ZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29raWUpCi0gICAgICAgICAgICAgICAgICAgICAgICBsb2dn ZXJfYnJva2VyLmRlYnVnICgnUG9zdC1hdXRoIHNjcmlwdCB7c2NyaXB0fSBmaW5pc2hlZCB3aXRo IHVzZXJuYW1lOiB7dXNlcm5hbWV9LCBwYXNzd29yZDoge3Bhc3N3b3JkfSwgdGFzazoge3Rhc2t9 LCBwcm9maWxlX2lkOiB7cHJvZmlsZV9pZH0sIGlwOiB7aXB9LCBjb29raWU6IHtjb29raWV9Jy5m b3JtYXQoc2NyaXB0PXNjcmlwdCx1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9J1hYWFhYJywg dGFzaz10YXNrLCBwcm9maWxlX2lkPXByb2ZpbGVfaWQsIGlwPWlwLCBjb29raWU9Y29va2llKSkK LSAgICAgICAgICAgICAgICAgICAgZXhjZXB0IEltcG9ydEVycm9yOgotICAgICAgICAgICAgICAg ICAgICAgICAgbG9nZ2VyX2Vycm9yLmVycm9yKCdObyBzdWNoIG9wdGlvbmFsIHNjcmlwdCBcJ3tz Y3JpcHR9XCcnLmZvcm1hdChzY3JpcHQ9c2NyaXB0KSkKKyAgICAgICAgdXNlcm5hbWUsIHBhc3N3 b3JkLCB0YXNrLCBwcm9maWxlX2lkLCBpcCwgY29va2llLCBhdXRoZWQsIHNlcnZlciA9IGJyb2tl cl9iYWNrZW5kLnJ1bl9vcHRpb25hbF9zY3JpcHQoc2NyaXB0X3R5cGU9J3Bvc3RfYXV0aF9zY3Jp cHRzJywgdXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0YXNrPXRhc2ssIHBy b2ZpbGVfaWQ9cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29raWUsIGF1dGhlZD1hY2Nlc3Mp CiAKKyAgICAgICAgaWYgYWNjZXNzOgorICAgICAgICAgICAgCiAgICAgICAgICAgICAjIyMKICAg ICAgICAgICAgICMjIyBDT05GSVJNIFNVQ0NFU1NGVUwgQVVUSEVOVElDQVRJT04gRklSU1QKICAg ICAgICAgICAgICMjIwpAQCAtMTkyLDkgKzE3MywxMSBAQCBjbGFzcyBYMkdvQnJva2VyV2ViKF9S ZXF1ZXN0SGFuZGxlcik6CiAgICAgICAgICAgICAgICAgaWYgcHJvZmlsZV9pZDoKIAogICAgICAg ICAgICAgICAgICAgICBwcm9maWxlX2luZm8gPSBicm9rZXJfYmFja2VuZC5zZWxlY3Rfc2Vzc2lv bihwcm9maWxlX2lkPXByb2ZpbGVfaWQsIHVzZXJuYW1lPXVzZXJuYW1lLCBwdWJrZXk9cHVia2V5 KQorCiAgICAgICAgICAgICAgICAgICAgIGlmIHByb2ZpbGVfaW5mby5oYXNfa2V5KCdzZXJ2ZXIn KToKKyAgICAgICAgICAgICAgICAgICAgICAgIHVzZXJuYW1lLCBwYXNzd29yZCwgdGFzaywgcHJv ZmlsZV9pZCwgaXAsIGNvb2tpZSwgYXV0aGVkLCBzZXJ2ZXIgPSBicm9rZXJfYmFja2VuZC5ydW5f b3B0aW9uYWxfc2NyaXB0KHNjcmlwdF90eXBlPSdzZWxlY3Rfc2Vzc2lvbl9zY3JpcHRzJywgdXNl cm5hbWU9dXNlcm5hbWUsIHBhc3N3b3JkPXBhc3N3b3JkLCB0YXNrPXRhc2ssIHByb2ZpbGVfaWQ9 cHJvZmlsZV9pZCwgaXA9aXAsIGNvb2tpZT1jb29raWUsIGF1dGhlZD1hY2Nlc3MsIHNlcnZlcj1w cm9maWxlX2luZm9bJ3NlcnZlciddKQogICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0ICs9 ICJTRVJWRVI6IgotICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0ICs9IHByb2ZpbGVfaW5m b1snc2VydmVyJ10KKyAgICAgICAgICAgICAgICAgICAgICAgIG91dHB1dCArPSBzZXJ2ZXIKICAg ICAgICAgICAgICAgICAgICAgICAgIGlmIHByb2ZpbGVfaW5mby5oYXNfa2V5KCdwb3J0Jyk6CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0ICs9ICI6e3BvcnR9Ii5mb3JtYXQocG9y dD1wcm9maWxlX2luZm9bJ3BvcnQnXSkKICAgICAgICAgICAgICAgICAgICAgICAgIG91dHB1dCAr PSAiXG4iCg== --533c0fc5_39386575_29a9--