From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sHYFLuOfpWW0IQEA62LTzQ:P1 (envelope-from ) for ; Mon, 15 Jan 2024 22:13:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id sHYFLuOfpWW0IQEA62LTzQ (envelope-from ) for ; Mon, 15 Jan 2024 22:13:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=excalamus.com header.s=zmail header.b=JpmXuBmx; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none; arc=pass ("zohomail.com:s=zohoarc:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705353187; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=hXG0ZjM9wY5iZpTNxauhryQrVVkY0hcY+WzaD4JPreg=; b=J3Ch+aJdcKxLTedSlXZ4LtqRGu/VxPnJe5htU+fhVGgGXnZlhIFzqza16lG5+5Y1dVQSD2 eGRuHT6fZPazwPRDi7uWSz2eQRE8ohJ0a4etVayzfFMlxuNozel7Pv/7UR6U89T7ckS06C T3syFlGFKP4gQ7a3x7OzZbxeFw+YGHFZ9GKPfuhhjMqaavM8r78oV57jisgdWOK/5h9W5Z z2vSm+6O1ncBLI+9iAfVnh1fMOv27ooOvcp1AYheeY5+jMSdQ7nssBWaQhbNqptKNK5Swu SVQzQfmgY71rmmBhgZT1GRtgd4E2GIzLb4B9K+EmP2nctJbqb9A1TO1opTfe5g== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=excalamus.com header.s=zmail header.b=JpmXuBmx; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none; arc=pass ("zohomail.com:s=zohoarc:i=1") ARC-Seal: i=2; s=key1; d=yhetil.org; t=1705353187; a=rsa-sha256; cv=pass; b=YoQM2QtG1Bogjev320Lz8MhLgag/SiHYcT3SWR35hIydogO5KW6bGM5bFjdCY2N/zHBV9g Oxhixe9wD6ZHYIA3kwnHRboHZP9NQwBsG6nwHdofnwm88AZpwRHpuDcVtxYYnWsm4LHmuW /qP3DbD3NSD3FHSN9TKJf/nfX48sreGVNg+ILr+Z66hbxk4FGVvRMXp+547O/PbeNbtRW9 UCZ1Zw2uG9sLG5lIY/PGMztOBccyepq2ymF3T2qu5SjCY1JhR+cYWT8LZo636FlaxEkcR+ EM6vlqEBTB+7SR3IA/dO94Uo2CppJgaBmpVaBeaf5kWLxYl/i+/P9oLs8gKqWQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 812C0393FF for ; Mon, 15 Jan 2024 22:13:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPUG1-0007JV-LS; Mon, 15 Jan 2024 16:12:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPUFy-0007JB-Mo for emacs-orgmode@gnu.org; Mon, 15 Jan 2024 16:12:31 -0500 Received: from sender4-op-o10.zoho.com ([136.143.188.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPUFw-0000q9-TS for emacs-orgmode@gnu.org; Mon, 15 Jan 2024 16:12:30 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1705353144; cv=none; d=zohomail.com; s=zohoarc; b=HSQ91ZNQhk4cQX123LYNNQHawMX7fe1M33hj6hQ4iUR+XD40k7sJaaUQD7UlH2xBi1hYEh48f8ACOhdPmJOZnbCRG4oxfHmYdV4qcVn8AGQtIYcj0/FiMb5DjmbZKL0i0qrCLjyCZ0LWkTsq/k2TsrqiVgX79WoN+O+ZBbuiou0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705353144; h=Content-Type:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hXG0ZjM9wY5iZpTNxauhryQrVVkY0hcY+WzaD4JPreg=; b=Ob4kOedee0CySCtXSxL25QLLzsLDj7ibf49yfurtHiMRcX/z164/q4AiG7wcXfPrW1+zplSVoIWEvkTPZpZFuJQhXbnCfmKbaOBo0yQRrQNcj0+ZxYla/6GR/7patKs+TgsnVnHBnG0zltX9Ubs7UK+uRw1DdpbCVxwYBfpQqhw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=excalamus.com; spf=pass smtp.mailfrom=matt@excalamus.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1705353144; s=zmail; d=excalamus.com; i=matt@excalamus.com; h=Date:Date:From:From:To:To:Message-Id:Message-Id:In-Reply-To:Subject:Subject:MIME-Version:Content-Type:Reply-To:Cc; bh=hXG0ZjM9wY5iZpTNxauhryQrVVkY0hcY+WzaD4JPreg=; b=JpmXuBmx1JlZzgoIC4d8A6+8+9jKVvjIHQnudOexZdoeB4PGuyqDkodydAmKnF1O N1TsiXRd3fmM6/nQ6sQrw63xwvLj3+rIXO/8V6aA56CfcsQhLWc3uo8Wb6eRmkkhdb5 lmi/1sPWhn/TunmYO4f0hduEIdm1TOjocjMP2A+c= Received: from mail.zoho.com by mx.zohomail.com with SMTP id 1705353143699668.4879968235341; Mon, 15 Jan 2024 13:12:23 -0800 (PST) Date: Mon, 15 Jan 2024 22:12:23 +0100 From: Matt To: "emacs-orgmode" Message-Id: <18d0ef7e532.10851f5ed1771823.3915352479016848501@excalamus.com> In-Reply-To: Subject: [PATCH] ob-shell: consistent prefix MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_5697030_1613498714.1705353143602" Importance: Medium User-Agent: Zoho Mail X-Mailer: Zoho Mail X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-1.1.0/204.931.97 Received-SPF: pass client-ip=136.143.188.10; envelope-from=matt@excalamus.com; helo=sender4-op-o10.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -9.45 X-Migadu-Scanner: mx13.migadu.com X-Spam-Score: -9.45 X-Migadu-Queue-Id: 812C0393FF X-TUID: WSAmYK81xA4t ------=_Part_5697030_1613498714.1705353143602 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable The attached patch makes names in ob-shell.el use the same prefix "org-babel-shell-" (along with a few similar minor consistency updates). Without the patch, three naming conventions exist: - org-babel-shell - org-babel-sh - ob-shell <----- that's my fault :) The Org Babel shell library was previously called "ob-sh.el" and later changed to "ob-shell.el". When this happened, the meaning of the "sh" changed. When the library was called "ob-sh.el", "sh" meant a generic shell. When the library was renamed "ob-shell.el", "shell" took on the role of a generic shell and "sh" became a reference to /bin/sh. The current "sh" names are generic and not specific to "/bin/sh" or something like the Bourne Shell. The patch updates all "sh" names to "shell". When I submitted my async changes, I introduced an "ob-shell" prefix. Emacs names typically begin with the library name and I just continued in that style. Org is different, however, because it's the "org-" library. For sub-libraries, like Babel, the convention is "org-babel--". ob-shell.el is unusual in that it supports multiple languages. However, ob-C.el also supports multiple languages and uses "org-babel--". I find there's no confusion using this style. FWIW, I found it confusing when I first started learning the Org code base that the naming convention is at the "org-" level and not at the library level (for example, "ob-shell-"). A large part of my confusion, I think, was simply inconsistencies within ob-shell. It's late for me, so rather than commit in a rush, I'm posting this for review/comment. The tests pass and I think I preserved all the API function names (like org-babel-execute:template). Thoughts? -- Matt Trzcinski Emacs Org contributor (ob-shell) Learn more about Org mode at https://orgmode.org Support Org development at=C2=A0https://liberapay.com/org-mode ------=_Part_5697030_1613498714.1705353143602 Content-Type: application/octet-stream; name=0001-make-name-prefixes-consistent.diff Content-Transfer-Encoding: base64 X-ZM_AttachId: 139246459436030290 Content-Disposition: attachment; filename=0001-make-name-prefixes-consistent.diff ZGlmZiAtLWdpdCBhL2xpc3Avb2Itc2hlbGwuZWwgYi9saXNwL29iLXNoZWxsLmVsCmluZGV4IDMx MTM1YjVmYi4uMjFkNDQzOTFhIDEwMDY0NAotLS0gYS9saXNwL29iLXNoZWxsLmVsCisrKyBiL2xp c3Avb2Itc2hlbGwuZWwKQEAgLTgwLDcgKzgwLDcgQEAgaXMgbW9kaWZpZWQgb3V0c2lkZSB0aGUg Q3VzdG9taXplIGludGVyZmFjZS4iCiAJICAgIChvcmctYmFiZWwtZXhlY3V0ZTpzaGVsbCBib2R5 IHBhcmFtcykpKSkKICAgICAgIChwdXQgZm5hbWUgJ2RlZmluaXRpb24tbmFtZSAnb3JnLWJhYmVs LXNoZWxsLWluaXRpYWxpemUpKQogICAgIChkZWZhbGlhcyAoaW50ZXJuIChjb25jYXQgIm9yZy1i YWJlbC12YXJpYWJsZS1hc3NpZ25tZW50czoiIG5hbWUpKQotICAgICAgIydvcmctYmFiZWwtdmFy aWFibGUtYXNzaWdubWVudHM6c2hlbGwKKyAgICAgICMnb3JnLWJhYmVsLXNoZWxsLXZhcmlhYmxl LWFzc2lnbm1lbnRzOnNoZWxsCiAgICAgICAoZm9ybWF0ICJSZXR1cm4gbGlzdCBvZiAlcyBzdGF0 ZW1lbnRzIGFzc2lnbmluZyB0byB0aGUgYmxvY2sncyBcCiB2YXJpYWJsZXMuIgogCSAgICAgIG5h bWUpKQpAQCAtMTE1LDEwICsxMTUsMTAgQEAgYSBzaGVsbCBleGVjdXRpb24gYmVpbmcgaXRzIGV4 aXQgY29kZS4iCiAoZGVmdW4gb3JnLWJhYmVsLWV4ZWN1dGU6c2hlbGwgKGJvZHkgcGFyYW1zKQog ICAiRXhlY3V0ZSBTaGVsbCBCT0RZIGFjY29yZGluZyB0byBQQVJBTVMuCiBUaGlzIGZ1bmN0aW9u IGlzIGNhbGxlZCBieSBgb3JnLWJhYmVsLWV4ZWN1dGUtc3JjLWJsb2NrJy4iCi0gIChsZXQqICgo c2Vzc2lvbiAob3JnLWJhYmVsLXNoLWluaXRpYXRlLXNlc3Npb24KKyAgKGxldCogKChzZXNzaW9u IChvcmctYmFiZWwtc2hlbGwtaW5pdGlhdGUtc2Vzc2lvbgogCQkgICAoY2RyIChhc3NxIDpzZXNz aW9uIHBhcmFtcykpKSkKIAkgKHN0ZGluIChsZXQgKChzdGRpbiAoY2RyIChhc3NxIDpzdGRpbiBw YXJhbXMpKSkpCi0gICAgICAgICAgICAgICAgICAod2hlbiBzdGRpbiAob3JnLWJhYmVsLXNoLXZh ci10by1zdHJpbmcKKyAgICAgICAgICAgICAgICAgICh3aGVuIHN0ZGluIChvcmctYmFiZWwtc2hl bGwtdmFyLXRvLXN0cmluZwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvcmctYmFi ZWwtcmVmLXJlc29sdmUgc3RkaW4pKSkpKQogCSAocmVzdWx0cy1wYXJhbXMgKGNkciAoYXNzcSA6 cmVzdWx0LXBhcmFtcyBwYXJhbXMpKSkKIAkgKHZhbHVlLWlzLWV4aXQtc3RhdHVzCkBAIC0xMjks MTAgKzEyOSwxMCBAQCBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCBieSBgb3JnLWJhYmVsLWV4ZWN1 dGUtc3JjLWJsb2NrJy4iCiAJIChjbWRsaW5lIChjZHIgKGFzc3EgOmNtZGxpbmUgcGFyYW1zKSkp CiAgICAgICAgICAoZnVsbC1ib2R5IChjb25jYXQKIAkJICAgICAob3JnLWJhYmVsLWV4cGFuZC1i b2R5OmdlbmVyaWMKLQkJICAgICAgYm9keSBwYXJhbXMgKG9yZy1iYWJlbC12YXJpYWJsZS1hc3Np Z25tZW50czpzaGVsbCBwYXJhbXMpKQorCQkgICAgICBib2R5IHBhcmFtcyAob3JnLWJhYmVsLXNo ZWxsLXZhcmlhYmxlLWFzc2lnbm1lbnRzOnNoZWxsIHBhcmFtcykpCiAJCSAgICAgKHdoZW4gdmFs dWUtaXMtZXhpdC1zdGF0dXMgIlxuZWNobyAkPyIpKSkpCiAgICAgKG9yZy1iYWJlbC1yZWFzc2Vt YmxlLXRhYmxlCi0gICAgIChvcmctYmFiZWwtc2gtZXZhbHVhdGUgc2Vzc2lvbiBmdWxsLWJvZHkg cGFyYW1zIHN0ZGluIGNtZGxpbmUpCisgICAgIChvcmctYmFiZWwtc2hlbGwtZXZhbHVhdGUgc2Vz c2lvbiBmdWxsLWJvZHkgcGFyYW1zIHN0ZGluIGNtZGxpbmUpCiAgICAgIChvcmctYmFiZWwtcGlj ay1uYW1lCiAgICAgICAoY2RyIChhc3NxIDpjb2xuYW1lLW5hbWVzIHBhcmFtcykpIChjZHIgKGFz c3EgOmNvbG5hbWVzIHBhcmFtcykpKQogICAgICAob3JnLWJhYmVsLXBpY2stbmFtZQpAQCAtMTQw LDggKzE0MCw4IEBAIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGJ5IGBvcmctYmFiZWwtZXhlY3V0 ZS1zcmMtYmxvY2snLiIKIAogKGRlZnVuIG9yZy1iYWJlbC1wcmVwLXNlc3Npb246c2hlbGwgKHNl c3Npb24gcGFyYW1zKQogICAiUHJlcGFyZSBTRVNTSU9OIGFjY29yZGluZyB0byB0aGUgaGVhZGVy IGFyZ3VtZW50cyBzcGVjaWZpZWQgaW4gUEFSQU1TLiIKLSAgKGxldCogKChzZXNzaW9uIChvcmct YmFiZWwtc2gtaW5pdGlhdGUtc2Vzc2lvbiBzZXNzaW9uKSkKLQkgKHZhci1saW5lcyAob3JnLWJh YmVsLXZhcmlhYmxlLWFzc2lnbm1lbnRzOnNoZWxsIHBhcmFtcykpKQorICAobGV0KiAoKHNlc3Np b24gKG9yZy1iYWJlbC1zaGVsbC1pbml0aWF0ZS1zZXNzaW9uIHNlc3Npb24pKQorCSAodmFyLWxp bmVzIChvcmctYmFiZWwtc2hlbGwtdmFyaWFibGUtYXNzaWdubWVudHM6c2hlbGwgcGFyYW1zKSkp CiAgICAgKG9yZy1iYWJlbC1jb21pbnQtaW4tYnVmZmVyIHNlc3Npb24KICAgICAgIChtYXBjIChs YW1iZGEgKHZhcikKICAgICAgICAgICAgICAgKGluc2VydCB2YXIpIChjb21pbnQtc2VuZC1pbnB1 dCBuaWwgdCkKQEAgLTE2MCwyNyArMTYwLDI3IEBAIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGJ5 IGBvcmctYmFiZWwtZXhlY3V0ZS1zcmMtYmxvY2snLiIKIAogDAogOzs7IEhlbHBlciBmdW5jdGlv bnMKLShkZWZ1biBvcmctYmFiZWwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOnNoLWdlbmVyaWMKKyhk ZWZ1biBvcmctYmFiZWwtc2hlbGwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOmRlZmF1bHQKICAgICAo dmFybmFtZSB2YWx1ZXMgJm9wdGlvbmFsIHNlcCBobGluZSkKICAgIlJldHVybiBhIGxpc3Qgb2Yg c3RhdGVtZW50cyBkZWNsYXJpbmcgdGhlIHZhbHVlcyBhcyBhIGdlbmVyaWMgdmFyaWFibGUuIgot ICAoZm9ybWF0ICIlcz0lcyIgdmFybmFtZSAob3JnLWJhYmVsLXNoLXZhci10by1zaCB2YWx1ZXMg c2VwIGhsaW5lKSkpCisgIChmb3JtYXQgIiVzPSVzIiB2YXJuYW1lIChvcmctYmFiZWwtc2hlbGwt dmFyLXRvLXNoZWxsIHZhbHVlcyBzZXAgaGxpbmUpKSkKIAotKGRlZnVuIG9yZy1iYWJlbC0tdmFy aWFibGUtYXNzaWdubWVudHM6ZmlzaAorKGRlZnVuIG9yZy1iYWJlbC1zaGVsbC0tdmFyaWFibGUt YXNzaWdubWVudHM6ZmlzaAogICAgICh2YXJuYW1lIHZhbHVlcyAmb3B0aW9uYWwgc2VwIGhsaW5l KQogICAiUmV0dXJuIGEgbGlzdCBvZiBzdGF0ZW1lbnRzIGRlY2xhcmluZyB0aGUgdmFsdWVzIGFz IGEgZmlzaCB2YXJpYWJsZS4iCi0gIChmb3JtYXQgInNldCAlcyAlcyIgdmFybmFtZSAob3JnLWJh YmVsLXNoLXZhci10by1zaCB2YWx1ZXMgc2VwIGhsaW5lKSkpCisgIChmb3JtYXQgInNldCAlcyAl cyIgdmFybmFtZSAob3JnLWJhYmVsLXNoZWxsLXZhci10by1zaGVsbCB2YWx1ZXMgc2VwIGhsaW5l KSkpCiAKLShkZWZ1biBvcmctYmFiZWwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOmJhc2hfYXJyYXkK KyhkZWZ1biBvcmctYmFiZWwtc2hlbGwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOmJhc2hfYXJyYXkK ICAgICAodmFybmFtZSB2YWx1ZXMgJm9wdGlvbmFsIHNlcCBobGluZSkKICAgIlJldHVybiBhIGxp c3Qgb2Ygc3RhdGVtZW50cyBkZWNsYXJpbmcgdGhlIHZhbHVlcyBhcyBhIGJhc2ggYXJyYXkuIgog ICAoZm9ybWF0ICJ1bnNldCAlc1xuZGVjbGFyZSAtYSAlcz0oICVzICkiCiAJICB2YXJuYW1lIHZh cm5hbWUKIAkgIChtYXBjb25jYXQKLQkgICAobGFtYmRhICh2YWx1ZSkgKG9yZy1iYWJlbC1zaC12 YXItdG8tc2ggdmFsdWUgc2VwIGhsaW5lKSkKKwkgICAobGFtYmRhICh2YWx1ZSkgKG9yZy1iYWJl bC1zaGVsbC12YXItdG8tc2hlbGwgdmFsdWUgc2VwIGhsaW5lKSkKIAkgICB2YWx1ZXMKIAkgICAi ICIpKSkKIAotKGRlZnVuIG9yZy1iYWJlbC0tdmFyaWFibGUtYXNzaWdubWVudHM6YmFzaF9hc3Nv YworKGRlZnVuIG9yZy1iYWJlbC1zaGVsbC0tdmFyaWFibGUtYXNzaWdubWVudHM6YmFzaF9hc3Nv YwogICAgICh2YXJuYW1lIHZhbHVlcyAmb3B0aW9uYWwgc2VwIGhsaW5lKQogICAiUmV0dXJuIGEg bGlzdCBvZiBzdGF0ZW1lbnRzIGRlY2xhcmluZyB0aGUgdmFsdWVzIGFzIGJhc2ggYXNzb2NpYXRp dmUgYXJyYXkuIgogICAoZm9ybWF0ICJ1bnNldCAlc1xuZGVjbGFyZSAtQSAlc1xuJXMiCkBAIC0x ODksMjIgKzE4OSwyMiBAQCBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCBieSBgb3JnLWJhYmVsLWV4 ZWN1dGUtc3JjLWJsb2NrJy4iCiAJICAgKGxhbWJkYSAoaXRlbXMpCiAJICAgICAoZm9ybWF0ICIl c1slc109JXMiCiAJCSAgICAgdmFybmFtZQotCQkgICAgIChvcmctYmFiZWwtc2gtdmFyLXRvLXNo IChjYXIgaXRlbXMpIHNlcCBobGluZSkKLQkJICAgICAob3JnLWJhYmVsLXNoLXZhci10by1zaCAo Y2RyIGl0ZW1zKSBzZXAgaGxpbmUpKSkKKwkJICAgICAob3JnLWJhYmVsLXNoZWxsLXZhci10by1z aGVsbCAoY2FyIGl0ZW1zKSBzZXAgaGxpbmUpCisJCSAgICAgKG9yZy1iYWJlbC1zaGVsbC12YXIt dG8tc2hlbGwgKGNkciBpdGVtcykgc2VwIGhsaW5lKSkpCiAJICAgdmFsdWVzCiAJICAgIlxuIikp KQogCi0oZGVmdW4gb3JnLWJhYmVsLS12YXJpYWJsZS1hc3NpZ25tZW50czpiYXNoICh2YXJuYW1l IHZhbHVlcyAmb3B0aW9uYWwgc2VwIGhsaW5lKQorKGRlZnVuIG9yZy1iYWJlbC1zaGVsbC0tdmFy aWFibGUtYXNzaWdubWVudHM6YmFzaCAodmFybmFtZSB2YWx1ZXMgJm9wdGlvbmFsIHNlcCBobGlu ZSkKICAgIlJlcHJlc2VudCB0aGUgcGFyYW1ldGVycyBhcyB1c2VmdWwgQmFzaCBzaGVsbCB2YXJp YWJsZXMuIgogICAocGNhc2UgdmFsdWVzCiAgICAgKGAoKCxfICxfIC4gLF8pIC4gLF8pCQk7dHdv LWRpbWVuc2lvbmFsIGFycmF5Ci0gICAgIChvcmctYmFiZWwtLXZhcmlhYmxlLWFzc2lnbm1lbnRz OmJhc2hfYXNzb2MgdmFybmFtZSB2YWx1ZXMgc2VwIGhsaW5lKSkKKyAgICAgKG9yZy1iYWJlbC1z aGVsbC0tdmFyaWFibGUtYXNzaWdubWVudHM6YmFzaF9hc3NvYyB2YXJuYW1lIHZhbHVlcyBzZXAg aGxpbmUpKQogICAgIChgKCxfIC4gLF8pCQkJCTtzaW1wbGUgbGlzdAotICAgICAob3JnLWJhYmVs LS12YXJpYWJsZS1hc3NpZ25tZW50czpiYXNoX2FycmF5IHZhcm5hbWUgdmFsdWVzIHNlcCBobGlu ZSkpCisgICAgIChvcmctYmFiZWwtc2hlbGwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOmJhc2hfYXJy YXkgdmFybmFtZSB2YWx1ZXMgc2VwIGhsaW5lKSkKICAgICAoXwkJCQkJO3NjYWxhciB2YWx1ZQot ICAgICAob3JnLWJhYmVsLS12YXJpYWJsZS1hc3NpZ25tZW50czpzaC1nZW5lcmljIHZhcm5hbWUg dmFsdWVzIHNlcCBobGluZSkpKSkKKyAgICAgKG9yZy1iYWJlbC1zaGVsbC0tdmFyaWFibGUtYXNz aWdubWVudHM6ZGVmYXVsdCB2YXJuYW1lIHZhbHVlcyBzZXAgaGxpbmUpKSkpCiAKLShkZWZ1biBv cmctYmFiZWwtdmFyaWFibGUtYXNzaWdubWVudHM6c2hlbGwgKHBhcmFtcykKKyhkZWZ1biBvcmct YmFiZWwtc2hlbGwtdmFyaWFibGUtYXNzaWdubWVudHM6c2hlbGwgKHBhcmFtcykKICAgIlJldHVy biBsaXN0IG9mIHNoZWxsIHN0YXRlbWVudHMgYXNzaWduaW5nIHRoZSBibG9jaydzIHZhcmlhYmxl cy4iCiAgIChsZXQgKChzZXAgKGNkciAoYXNzcSA6c2VwYXJhdG9yIHBhcmFtcykpKQogCShobGlu ZSAod2hlbiAoc3RyaW5nPSAieWVzIiAoY2RyIChhc3NxIDpobGluZXMgcGFyYW1zKSkpCkBAIC0y MTMsMjUgKzIxMywyNSBAQCBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCBieSBgb3JnLWJhYmVsLWV4 ZWN1dGUtc3JjLWJsb2NrJy4iCiAgICAgKG1hcGNhcgogICAgICAobGFtYmRhIChwYWlyKQogICAg ICAgIChpZiAoc3RyaW5nLXN1ZmZpeC1wICJiYXNoIiBzaGVsbC1maWxlLW5hbWUpCi0JICAgKG9y Zy1iYWJlbC0tdmFyaWFibGUtYXNzaWdubWVudHM6YmFzaAorCSAgIChvcmctYmFiZWwtc2hlbGwt LXZhcmlhYmxlLWFzc2lnbm1lbnRzOmJhc2gKICAgICAgICAgICAgIChjYXIgcGFpcikgKGNkciBw YWlyKSBzZXAgaGxpbmUpCiAgICAgICAgICAoaWYgKHN0cmluZy1zdWZmaXgtcCAiZmlzaCIgc2hl bGwtZmlsZS1uYW1lKQotCSAgICAgKG9yZy1iYWJlbC0tdmFyaWFibGUtYXNzaWdubWVudHM6Zmlz aAorCSAgICAgKG9yZy1iYWJlbC1zaGVsbC0tdmFyaWFibGUtYXNzaWdubWVudHM6ZmlzaAogICAg ICAgICAgICAgICAoY2FyIHBhaXIpIChjZHIgcGFpcikgc2VwIGhsaW5lKQotICAgICAgICAgICAo b3JnLWJhYmVsLS12YXJpYWJsZS1hc3NpZ25tZW50czpzaC1nZW5lcmljCisgICAgICAgICAgIChv cmctYmFiZWwtc2hlbGwtLXZhcmlhYmxlLWFzc2lnbm1lbnRzOmRlZmF1bHQKIAkgICAgKGNhciBw YWlyKSAoY2RyIHBhaXIpIHNlcCBobGluZSkpKSkKICAgICAgKG9yZy1iYWJlbC0tZ2V0LXZhcnMg cGFyYW1zKSkpKQogCi0oZGVmdW4gb3JnLWJhYmVsLXNoLXZhci10by1zaCAodmFyICZvcHRpb25h bCBzZXAgaGxpbmUpCisoZGVmdW4gb3JnLWJhYmVsLXNoZWxsLXZhci10by1zaGVsbCAodmFyICZv cHRpb25hbCBzZXAgaGxpbmUpCiAgICJDb252ZXJ0IGFuIGVsaXNwIHZhbHVlIHRvIGEgc2hlbGwg dmFyaWFibGUuCiBDb252ZXJ0IGFuIGVsaXNwIHZhciBpbnRvIGEgc3RyaW5nIG9mIHNoZWxsIGNv bW1hbmRzIHNwZWNpZnlpbmcgYQogdmFyIG9mIHRoZSBzYW1lIHZhbHVlLiIKICAgKGNvbmNhdCAi JyIgKHJlcGxhY2UtcmVnZXhwLWluLXN0cmluZwogCSAgICAgICAiJyIgIidcIidcIiciCi0JICAg ICAgIChvcmctYmFiZWwtc2gtdmFyLXRvLXN0cmluZyB2YXIgc2VwIGhsaW5lKSkKKwkgICAgICAg KG9yZy1iYWJlbC1zaGVsbC12YXItdG8tc3RyaW5nIHZhciBzZXAgaGxpbmUpKQogCSAgIiciKSkK IAotKGRlZnVuIG9yZy1iYWJlbC1zaC12YXItdG8tc3RyaW5nICh2YXIgJm9wdGlvbmFsIHNlcCBo bGluZSkKKyhkZWZ1biBvcmctYmFiZWwtc2hlbGwtdmFyLXRvLXN0cmluZyAodmFyICZvcHRpb25h bCBzZXAgaGxpbmUpCiAgICJDb252ZXJ0IGFuIGVsaXNwIHZhbHVlIHRvIGEgc3RyaW5nLiIKICAg KGxldCAoKGVjaG8tdmFyIChsYW1iZGEgKHYpIChpZiAoc3RyaW5ncCB2KSB2IChmb3JtYXQgIiVT IiB2KSkpKSkKICAgICAoY29uZApAQCAtMjQyLDE0ICsyNDIsMTQgQEAgdmFyIG9mIHRoZSBzYW1l IHZhbHVlLiIKICAgICAgIChtYXBjb25jYXQgZWNoby12YXIgdmFyICJcbiIpKQogICAgICAodCAo ZnVuY2FsbCBlY2hvLXZhciB2YXIpKSkpKQogCi0oZGVmdmFyIG9yZy1iYWJlbC1zaC1lb2UtaW5k aWNhdG9yICJlY2hvICdvcmdfYmFiZWxfc2hfZW9lJyIKKyhkZWZ2YXIgb3JnLWJhYmVsLXNoZWxs LWVvZS1pbmRpY2F0b3IgImVjaG8gJ29yZ19iYWJlbF9zaF9lb2UnIgogICAiU3RyaW5nIHRvIGlu ZGljYXRlIHRoYXQgZXZhbHVhdGlvbiBoYXMgY29tcGxldGVkLiIpCi0oZGVmdmFyIG9yZy1iYWJl bC1zaC1lb2Utb3V0cHV0ICJvcmdfYmFiZWxfc2hfZW9lIgorKGRlZnZhciBvcmctYmFiZWwtc2hl bGwtZW9lLW91dHB1dCAib3JnX2JhYmVsX3NoX2VvZSIKICAgIlN0cmluZyB0byBpbmRpY2F0ZSB0 aGF0IGV2YWx1YXRpb24gaGFzIGNvbXBsZXRlZC4iKQotKGRlZnZhciBvcmctYmFiZWwtc2gtcHJv bXB0ICJvcmdfYmFiZWxfc2hfcHJvbXB0PiAiCisoZGVmdmFyIG9yZy1iYWJlbC1zaGVsbC1wcm9t cHQgIm9yZ19iYWJlbF9zaF9wcm9tcHQ+ICIKICAgIlN0cmluZyB0byBzZXQgcHJvbXB0IGluIHNl c3Npb24gc2hlbGwuIikKIAotKGRlZnVuIG9yZy1iYWJlbC1zaC1pbml0aWF0ZS1zZXNzaW9uICgm b3B0aW9uYWwgc2Vzc2lvbiBfcGFyYW1zKQorKGRlZnVuIG9yZy1iYWJlbC1zaGVsbC1pbml0aWF0 ZS1zZXNzaW9uICgmb3B0aW9uYWwgc2Vzc2lvbiBfcGFyYW1zKQogICAiSW5pdGlhdGUgYSBzZXNz aW9uIG5hbWVkIFNFU1NJT04gYWNjb3JkaW5nIHRvIFBBUkFNUy4iCiAgICh3aGVuIChhbmQgc2Vz c2lvbiAobm90IChzdHJpbmc9IHNlc3Npb24gIm5vbmUiKSkpCiAgICAgKHNhdmUtd2luZG93LWV4 Y3Vyc2lvbgpAQCAtMjY0LDkgKzI2NCw5IEBAIHZhciBvZiB0aGUgc2FtZSB2YWx1ZS4iCiAgICAg ICAgICAgICAgIChvciAoY2RyIChhc3NvYyAoZmlsZS1uYW1lLW5vbmRpcmVjdG9yeSBzaGVsbC1m aWxlLW5hbWUpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcmctYmFiZWwtc2hlbGwt c2V0LXByb21wdC1jb21tYW5kcykpCiAgICAgICAgICAgICAgICAgICAoYWxpc3QtZ2V0IHQgb3Jn LWJhYmVsLXNoZWxsLXNldC1wcm9tcHQtY29tbWFuZHMpKQotICAgICAgICAgICAgICBvcmctYmFi ZWwtc2gtcHJvbXB0KSkKKyAgICAgICAgICAgICAgb3JnLWJhYmVsLXNoZWxsLXByb21wdCkpCiAg ICAgICAgICAgICAoc2V0cS1sb2NhbCBjb21pbnQtcHJvbXB0LXJlZ2V4cAotICAgICAgICAgICAg ICAgICAgICAgICAgKGNvbmNhdCAiXiIgKHJlZ2V4cC1xdW90ZSBvcmctYmFiZWwtc2gtcHJvbXB0 KQorICAgICAgICAgICAgICAgICAgICAgICAgKGNvbmNhdCAiXiIgKHJlZ2V4cC1xdW90ZSBvcmct YmFiZWwtc2hlbGwtcHJvbXB0KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICoi KSkKIAkgICAgOzsgTmVlZGVkIGZvciBFbWFjcyAyMyBzaW5jZSB0aGUgbWFya2VyIGlzIGluaXRp YWxseQogCSAgICA7OyB1bmRlZmluZWQgYW5kIHRoZSBmaWx0ZXIgZnVuY3Rpb25zIHRyeSB0byB1 c2UgaXQgd2l0aG91dApAQCAtMjc0LDE2ICsyNzQsMTYgQEAgdmFyIG9mIHRoZSBzYW1lIHZhbHVl LiIKIAkgICAgKHNldC1tYXJrZXIgY29taW50LWxhc3Qtb3V0cHV0LXN0YXJ0IChwb2ludCkpCiAJ ICAgIChnZXQtYnVmZmVyIChjdXJyZW50LWJ1ZmZlcikpKSkpKSkKIAotKGRlZmNvbnN0IG9iLXNo ZWxsLWFzeW5jLWluZGljYXRvciAiZWNobyAnb2JfY29taW50X2FzeW5jX3NoZWxsXyVzXyVzJyIK KyhkZWZjb25zdCBvcmctYmFiZWwtc2hlbGwtYXN5bmMtaW5kaWNhdG9yICJlY2hvICdvYl9jb21p bnRfYXN5bmNfc2hlbGxfJXNfJXMnIgogICAiU2Vzc2lvbiBvdXRwdXQgZGVsaW1pdGVyIHRlbXBs YXRlLgogU2VlIGBvcmctYmFiZWwtY29taW50LWFzeW5jLWluZGljYXRvcicuIikKIAotKGRlZnVu IG9iLXNoZWxsLWFzeW5jLWNodW5rLWNhbGxiYWNrIChzdHJpbmcpCisoZGVmdW4gb3JnLWJhYmVs LXNoZWxsLWFzeW5jLWNodW5rLWNhbGxiYWNrIChzdHJpbmcpCiAgICJGaWx0ZXIgYXBwbGllZCB0 byByZXN1bHRzIGJlZm9yZSBpbnNlcnRpb24uCiBTZWUgYG9yZy1iYWJlbC1jb21pbnQtYXN5bmMt Y2h1bmstY2FsbGJhY2snLiIKICAgKHJlcGxhY2UtcmVnZXhwLWluLXN0cmluZyBjb21pbnQtcHJv bXB0LXJlZ2V4cCAiIiBzdHJpbmcpKQogCi0oZGVmdW4gb3JnLWJhYmVsLXNoLWV2YWx1YXRlIChz ZXNzaW9uIGJvZHkgJm9wdGlvbmFsIHBhcmFtcyBzdGRpbiBjbWRsaW5lKQorKGRlZnVuIG9yZy1i YWJlbC1zaGVsbC1ldmFsdWF0ZSAoc2Vzc2lvbiBib2R5ICZvcHRpb25hbCBwYXJhbXMgc3RkaW4g Y21kbGluZSkKICAgIlBhc3MgQk9EWSB0byB0aGUgU2hlbGwgcHJvY2VzcyBpbiBCVUZGRVIuCiBJ ZiBSRVNVTFQtVFlQRSBlcXVhbHMgYG91dHB1dCcgdGhlbiByZXR1cm4gYSBsaXN0IG9mIHRoZSBv dXRwdXRzCiBvZiB0aGUgc3RhdGVtZW50cyBpbiBCT0RZLCBpZiBSRVNVTFQtVFlQRSBlcXVhbHMg YHZhbHVlJyB0aGVuCkBAIC0zMjgsMjggKzMyOCwyOCBAQCByZXR1cm4gdGhlIHZhbHVlIG9mIHRo ZSBsYXN0IHN0YXRlbWVudCBpbiBCT0RZLiIKICAgICAgICAgICAgICAgICAgICAgIHNlc3Npb24K ICAgICAgICAgICAgICAgICAgICAgIChjdXJyZW50LWJ1ZmZlcikKICAgICAgICAgICAgICAgICAg ICAgICJvYl9jb21pbnRfYXN5bmNfc2hlbGxfXFwoLitcXClfXFwoLitcXCkiCi0gICAgICAgICAg ICAgICAgICAgICAnb2Itc2hlbGwtYXN5bmMtY2h1bmstY2FsbGJhY2sKKyAgICAgICAgICAgICAg ICAgICAgICdvcmctYmFiZWwtc2hlbGwtYXN5bmMtY2h1bmstY2FsbGJhY2sKICAgICAgICAgICAg ICAgICAgICAgIG5pbCkKICAgICAgICAgICAgICAgICAgICAgKG9yZy1iYWJlbC1jb21pbnQtYXN5 bmMtZGVsZXRlLWRhbmdsaW5nLWFuZC1ldmFsCiAgICAgICAgICAgICAgICAgICAgICAgICBzZXNz aW9uCi0gICAgICAgICAgICAgICAgICAgICAgKGluc2VydCAoZm9ybWF0IG9iLXNoZWxsLWFzeW5j LWluZGljYXRvciAic3RhcnQiIHV1aWQpKQorICAgICAgICAgICAgICAgICAgICAgIChpbnNlcnQg KGZvcm1hdCBvcmctYmFiZWwtc2hlbGwtYXN5bmMtaW5kaWNhdG9yICJzdGFydCIgdXVpZCkpCiAg ICAgICAgICAgICAgICAgICAgICAgKGNvbWludC1zZW5kLWlucHV0IG5pbCB0KQogICAgICAgICAg ICAgICAgICAgICAgIChpbnNlcnQgKG9yZy10cmltIGJvZHkpKQogICAgICAgICAgICAgICAgICAg ICAgIChjb21pbnQtc2VuZC1pbnB1dCBuaWwgdCkKLSAgICAgICAgICAgICAgICAgICAgICAoaW5z ZXJ0IChmb3JtYXQgb2Itc2hlbGwtYXN5bmMtaW5kaWNhdG9yICJlbmQiIHV1aWQpKQorICAgICAg ICAgICAgICAgICAgICAgIChpbnNlcnQgKGZvcm1hdCBvcmctYmFiZWwtc2hlbGwtYXN5bmMtaW5k aWNhdG9yICJlbmQiIHV1aWQpKQogICAgICAgICAgICAgICAgICAgICAgIChjb21pbnQtc2VuZC1p bnB1dCBuaWwgdCkpCiAgICAgICAgICAgICAgICAgICAgIHV1aWQpKQogCSAgICAgIChtYXBjb25j YXQKLQkgICAgICAgIydvcmctYmFiZWwtc2gtc3RyaXAtd2VpcmQtbG9uZy1wcm9tcHQKKwkgICAg ICAgIydvcmctYmFiZWwtc2hlbGwtc3RyaXAtd2VpcmQtbG9uZy1wcm9tcHQKIAkgICAgICAgKG1h cGNhcgogCSAgICAgICAgIydvcmctdHJpbQogCSAgICAgICAgKGJ1dGxhc3QgOyBSZW1vdmUgZW9l IGluZGljYXRvcgogCSAgICAgICAgIChvcmctYmFiZWwtY29taW50LXdpdGgtb3V0cHV0Ci0JCSAg ICAgKHNlc3Npb24gb3JnLWJhYmVsLXNoLWVvZS1vdXRwdXQgdCBib2R5KQorCQkgICAgIChzZXNz aW9uIG9yZy1iYWJlbC1zaGVsbC1lb2Utb3V0cHV0IHQgYm9keSkKICAgICAgICAgICAgICAgICAg ICAoaW5zZXJ0IChvcmctdHJpbSBib2R5KSAiXG4iCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICBvcmctYmFiZWwtc2gtZW9lLWluZGljYXRvcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAg IG9yZy1iYWJlbC1zaGVsbC1lb2UtaW5kaWNhdG9yKQogCQkgICAoY29taW50LXNlbmQtaW5wdXQg bmlsIHQpKQotICAgICAgICAgICAgICAgICA7OyBSZW1vdmUgYG9yZy1iYWJlbC1zaC1lb2UtaW5k aWNhdG9yJyBvdXRwdXQgbGluZS4KKyAgICAgICAgICAgICAgICAgOzsgUmVtb3ZlIGBvcmctYmFi ZWwtc2hlbGwtZW9lLWluZGljYXRvcicgb3V0cHV0IGxpbmUuCiAJICAgICAgICAgMSkpCiAJICAg ICAgICJcbiIpKSkKIAkgICA7OyBFeHRlcm5hbCBzaGVsbCBzY3JpcHQsIHdpdGggb3Igd2l0aG91 dCBhIHByZWRlZmluZWQKQEAgLTM4MCw3ICszODAsNyBAQCByZXR1cm4gdGhlIHZhbHVlIG9mIHRo ZSBsYXN0IHN0YXRlbWVudCBpbiBCT0RZLiIKICAgICAgICAgICAgICh3aXRoLXRlbXAtZmlsZSB0 bXAtZmlsZSAoaW5zZXJ0IHJlc3VsdHMpKQogICAgICAgICAgICAgKG9yZy1iYWJlbC1pbXBvcnQt ZWxpc3AtZnJvbS1maWxlIHRtcC1maWxlKSkpKSkpKQogCi0oZGVmdW4gb3JnLWJhYmVsLXNoLXN0 cmlwLXdlaXJkLWxvbmctcHJvbXB0IChzdHJpbmcpCisoZGVmdW4gb3JnLWJhYmVsLXNoZWxsLXN0 cmlwLXdlaXJkLWxvbmctcHJvbXB0IChzdHJpbmcpCiAgICJSZW1vdmUgcHJvbXB0IGNydWZ0IGZy b20gYSBzdHJpbmcgb2Ygc2hlbGwgb3V0cHV0LiIKICAgKHdoaWxlIChzdHJpbmctbWF0Y2ggIl4l ICtbXHJcbiRdKyAqIiBzdHJpbmcpCiAgICAgKHNldHEgc3RyaW5nIChzdWJzdHJpbmcgc3RyaW5n IChtYXRjaC1lbmQgMCkpKSkK ------=_Part_5697030_1613498714.1705353143602--