From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yFVWCecrP2MVvAAAbAwnHQ (envelope-from ) for ; Thu, 06 Oct 2022 21:26:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gDJJCecrP2N7jQAAauVa8A (envelope-from ) for ; Thu, 06 Oct 2022 21:26:31 +0200 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 AE05B1440F for ; Thu, 6 Oct 2022 21:26:30 +0200 (CEST) Received: from localhost ([::1]:40250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ogWVp-0005Rq-8e for larch@yhetil.org; Thu, 06 Oct 2022 15:26:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogWUd-0005R2-6u for emacs-orgmode@gnu.org; Thu, 06 Oct 2022 15:25:15 -0400 Received: from mr85p00im-zteg06022001.me.com ([17.58.23.193]:48860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogWUa-0003Ta-Rt for emacs-orgmode@gnu.org; Thu, 06 Oct 2022 15:25:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1665084311; bh=bhPgmrHMGHdUh+ObisSJBe8hd0AtyHMJ0Cvga4/nQ3g=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=0VWP5ebnEFZYcUIvDCzlzSNvlBMpRJKX1DwZhAHRNHeqSp1YJ/ZuOMHQuNe62oem2 KGVOWJGuckFnAHIw91ierr7Yg8Gd/a9/Dq0QHSjAoDAFo/EfB2MzqpP6FvYZjAvI2E E2WPnSqKxccVhFUtCDWBUU8sEm/E3iLfMLi4f0CGREvkbioD3Qg3oMGk0swH0ccaCT fcY6exwsmQA4OlT4VbZtLPUBIe4ZNlg/UK9C975+axHJALjbY4WgNs0TLLyxz4hSWH 38W011GtX8pWkRqlh4LVIVLQmxN78k0Nl1cOgyjOpHbmix0n0Hyiwc7bdTPrJW2hK0 1zn0G/QWoBQTQ== Received: from Rudolfs-MacBook-Air.local (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-zteg06022001.me.com (Postfix) with ESMTPSA id BEED7800805 for ; Thu, 6 Oct 2022 19:25:10 +0000 (UTC) From: =?utf-8?Q?Rudolf_Adamkovi=C4=8D?= To: emacs-orgmode@gnu.org Subject: Fix 'ob-sed-test' on BSD/macOS Date: Thu, 06 Oct 2022 21:25:07 +0200 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Proofpoint-GUID: _CaitYusM7PZtrKvLwKeZbeLACsCuJV8 X-Proofpoint-ORIG-GUID: _CaitYusM7PZtrKvLwKeZbeLACsCuJV8 X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.138,18.0.572,17.0.605.474.0000000_definitions?= =?UTF-8?Q?=3D2020-02-14=5F11:2020-02-14=5F02,2020-02-14=5F11,2020-01-23?= =?UTF-8?Q?=5F02_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 bulkscore=0 malwarescore=0 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=706 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210060113 Received-SPF: pass client-ip=17.58.23.193; envelope-from=salutis@me.com; helo=mr85p00im-zteg06022001.me.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665084390; 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:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bhPgmrHMGHdUh+ObisSJBe8hd0AtyHMJ0Cvga4/nQ3g=; b=u2KULIcaE02HdtSqfSd88R7dv0diHeM+2hpL9pLTpx8B+XzJlbM/9ZaYW7GsnVovEZP5xX 2LW05FcU4H3utpZzZzW3r7N3aWGOXoRMCWt729NcCbs/e9Wn77BsWYlY0ZttIljM+QTlq7 H7aOL3J2I//kFTH8uHgTEbn1sfKqwsqe3qEwiBcc+VIbAMDl2sWHpIgEa4UzEvIBBZlT0u ZNRvHEXmsiVfNGq60z43YGC5PwumWzpt3T3krvIhWpYvYWshZfSq1ADsnVR6kTNr3IncXi 7tg14zgxMjfjbK28HUO0MKeakm+3EwtLBgFSINjtCIsBCpDD71kUVtDZg+cX6A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665084390; a=rsa-sha256; cv=none; b=kYikDILeH56MvDPQReeabbFpTtQOw+auNl9/RyeQ6bweZvv05YRAYXZBzEcLxk55JAcaAz 7c7cCQ12w21W3x+1CooWViXuWwx9Gx5Irkm1kEFhZIsruR1eBU3omUGOWyXsH+NRfZ2STI RKb5vQjpRP6iaaXnWZ+BRmIK7t519fkwP6UKvzHdxOolb05BJfWdPG9rK/5GR0c04aIw/a 1dfR3eEv/ZDojgUrSNZLzI/yu3mMco8OpKTkrRTdFR0lY+XZMdGTVg/e+5uANP3S6JYxKC 1PqXDLcsOqjviuWFD2pev/rQyw0y3wtx2Ms9gy6yFXYwoVOZ9h+S6llP1ag85w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=me.com header.s=1a1hai header.b=0VWP5ebn; dmarc=pass (policy=quarantine) header.from=me.com; 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" X-Migadu-Spam-Score: -2.47 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=me.com header.s=1a1hai header.b=0VWP5ebn; dmarc=pass (policy=quarantine) header.from=me.com; 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" X-Migadu-Queue-Id: AE05B1440F X-Spam-Score: -2.47 X-Migadu-Scanner: scn1.migadu.com X-TUID: 5UK2R8FUkB0I --=-=-= Content-Type: text/plain Please see the attached two patches: (1) fixes 'ob-sed-test' on BSD/macOS, and (2) fixes a typo in 'ob-sed'. Rudy --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-ob-sed-test-Make-the-tests-pass-on-BSD-systems-such-.patch >From 868f878cb50c5234a16b2675688256892467f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rudolf=20Adamkovi=C4=8D?= Date: Thu, 6 Oct 2022 21:14:17 +0200 Subject: [PATCH 1/2] ob-sed-test: Make the tests pass on BSD systems, such as macOS * testing/examples/ob-sed-test.org: Fix BSD sed incompatibility --- testing/examples/ob-sed-test.org | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testing/examples/ob-sed-test.org b/testing/examples/ob-sed-test.org index aae1323ca..2f8bcb089 100644 --- a/testing/examples/ob-sed-test.org +++ b/testing/examples/ob-sed-test.org @@ -30,6 +30,9 @@ :ID: E3C6A8BA-39FF-4840-BA8E-90D5C4365AB1 :END: - #+BEGIN_SRC sed :in-file test2.txt :cmd-line "-i" + /Note:/ Use =-i.backup= instead of just =-i= because the BSD =sed=, + unlike the GNU =sed=, requires =-i =. + + #+BEGIN_SRC sed :in-file test2.txt :cmd-line "-i.backup" s/test/tested again/ #+END_SRC -- 2.37.3 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-ob-sed-Fix-typo.patch >From 34e352b07a53b070a6ea02f820c8d63d0abecebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rudolf=20Adamkovi=C4=8D?= Date: Thu, 6 Oct 2022 21:18:57 +0200 Subject: [PATCH 2/2] ob-sed: Fix typo * lisp/ob-sed.el: Fix a typo in a comment --- lisp/ob-sed.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el index 9befa7163..ecebef925 100644 --- a/lisp/ob-sed.el +++ b/lisp/ob-sed.el @@ -35,7 +35,7 @@ ;; In addition to the normal header arguments, ob-sed also provides ;; :cmd-line and :in-file. :cmd-line allows one to pass other flags to ;; the sed command like the "--in-place" flag which makes sed edit the -;; file pass to it instead of outputting to standard out or to a +;; file passed to it instead of outputting to standard out or to a ;; different file. :in-file is a header arguments that allows one to ;; tell Org Babel which file the sed script to act on. -- 2.37.3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 "It is no paradox to say that in our most theoretical moods we may be nearest to our most practical applications." -- Alfred North Whitehead, 1861-1947 Rudolf Adamkovi=C4=8D [he/him] Studenohorsk=C3=A1 25 84103 Bratislava Slovakia --=-=-=--