From patchwork Fri Nov 26 19:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david larsson X-Patchwork-Id: 34829 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C3E227BBEA; Fri, 26 Nov 2021 19:17:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E2F027BBE9 for ; Fri, 26 Nov 2021 19:17:38 +0000 (GMT) Received: from localhost ([::1]:57148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqgj3-00036i-Kw for patchwork@mira.cbaines.net; Fri, 26 Nov 2021 14:17:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqgiW-0002yb-Qq for guix-patches@gnu.org; Fri, 26 Nov 2021 14:17:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49031) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqgiU-0007sN-9N for guix-patches@gnu.org; Fri, 26 Nov 2021 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqgiU-0000pQ-4n for guix-patches@gnu.org; Fri, 26 Nov 2021 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51791] [PATCH 2/2 v2]: Update guile-bash Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Nov 2021 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51791 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51791@debbugs.gnu.org Cc: Guix-patches Received: via spool by 51791-submit@debbugs.gnu.org id=B51791.16379541883133 (code B ref 51791); Fri, 26 Nov 2021 19:17:02 +0000 Received: (at 51791) by debbugs.gnu.org; 26 Nov 2021 19:16:28 +0000 Received: from localhost ([127.0.0.1]:60577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqghw-0000oT-Ap for submit@debbugs.gnu.org; Fri, 26 Nov 2021 14:16:28 -0500 Received: from server0.selfhosted.xyz ([217.64.149.7]:43416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqghu-0000oC-3R for 51791@debbugs.gnu.org; Fri, 26 Nov 2021 14:16:26 -0500 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 1DC9827531CF; Fri, 26 Nov 2021 20:16:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1637954179; bh=YZDoz4G5sf3/P5iWhVoNvkgN2NBw/xUrfIJ9836xfjo=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=xb1pvUjHEny+1x/xcKiyvYaA6POViQXt9/wpbqXwRZq9UOr0KvyImAOl10+mIZI0b nShferrWwqk9S0ShVa/4IUvNLDohelY2GbxCxMbJ1sH4a8o+aZJbrBJl9UnJmrVAQH hLlbmJjKchBjO3WEa6OM9Ikzdfsk0DqSj0QuYBMuOsJAk2o9FwDQK9U1RQ2enyrfph lM1lxSG0zACaPuV2BLRGVKQyzsqLXC8u3AxkxSBwRgt2I9PqfsdFdfpzkynFzh1T7m +2Y+CsxqlcQJKwBCXWki9CrWr2UFkw6UJiVLrgnWr5BbowYK2BIsNu689/LfVQ+DlR ULQSOkRdrCGjQ== X-Fuglu-Suspect: 3c4c52d213f64841b40fabb5251fe33e X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA; Fri, 26 Nov 2021 20:16:13 +0100 (CET) MIME-Version: 1.0 Date: Fri, 26 Nov 2021 20:16:12 +0100 From: david larsson In-Reply-To: <8d6b871864d52beebcdbe83cae97769c@selfhosted.xyz> References: <8d6b871864d52beebcdbe83cae97769c@selfhosted.xyz> Message-ID: <650e73fe887c2524947b7c06d9dc9994@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Forgot to update gnu/local.mk with the patch file for guile-bash so fixing that with this new patch. From b5e120040b47e590aa276a2802aac53139a72196 Mon Sep 17 00:00:00 2001 From: David Larsson Date: Fri, 12 Nov 2021 13:42:41 +0100 Subject: [PATCH 2/2] gnu: guile-bash: Add patch that fixes reading args. This patch allows guile-bash defined bash-functions to read newline- or null-separated arguments from stdin, making it usable in bash pipelines. It also fixes a bug with arguments containing whitespace not being properly passed to the corresponding guile function. * gnu/packages/guile-xyz (guile-bash)[patches]: add patch. * gnu/packages/patches/guile-bash-args-from-stdin.patch: new file. * gnu/local.mk: add patch file. --- gnu/local.mk | 1 + gnu/packages/guile-xyz.scm | 1 + .../patches/guile-bash-args-from-stdin.patch | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/guile-bash-args-from-stdin.patch diff --git a/gnu/local.mk b/gnu/local.mk index 05258ac054..fdc562b710 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1242,6 +1242,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-3.0-relocatable.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-3.0-linux-syscalls.patch \ + %D%/packages/patches/guile-bash-args-from-stdin.patch \ %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-present-coding.patch \ diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1d35c41796..511d766a6f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -419,6 +419,7 @@ dictionary and suggesting spelling corrections.") (uri (git-reference (commit commit) (url home-page))) + (patches (search-patches "guile-bash-args-from-stdin.patch")) (sha256 (base32 "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p")) diff --git a/gnu/packages/patches/guile-bash-args-from-stdin.patch b/gnu/packages/patches/guile-bash-args-from-stdin.patch new file mode 100644 index 0000000000..ad42616c70 --- /dev/null +++ b/gnu/packages/patches/guile-bash-args-from-stdin.patch @@ -0,0 +1,42 @@ +From a124921666a16cb4e93f59a653f98b99c78eb2ca Mon Sep 17 00:00:00 2001 +From: David Larsson +Date: Thu, 11 Nov 2021 14:07:04 +0100 +Subject: [PATCH] Enable reading arguments from bash via stdin + +* lisp/gnu/bash.scm(define-bash-function): read from stdin +to SCM_ARGS array when it is open, and separate args by null +instead of newline if -z option is passed as $1. +--- + lisp/gnu/bash.scm | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/lisp/gnu/bash.scm b/lisp/gnu/bash.scm +index 199ebc0..e9dcea5 100644 +--- a/lisp/gnu/bash.scm ++++ b/lisp/gnu/bash.scm +@@ -326,10 +326,18 @@ + (hashq-set! *funcs* symbol thunk) + (unsafe-format/eval + "function ~a { +- SCM_ARGS=($@) ; +- local retval=$~a ; +- unset SCM_ARGS ; +- return $retval ; ++ local -a Input SCM_ARGS ; ++ [[ ! -t 0 ]] && mapfile -d '' Input ; ++ if [[ -n \"${Input[@]}\" ]]; then ++ if [[ \"$1\" == -z ]]; then ++ local -a SCM_ARGS=\"(${Input[*]@Q})\" ; ++ else ++ mapfile -t SCM_ARGS < <(printf '%s' \"${Input[@]}\"); fi ; ++ else ++ SCM_ARGS=(\"$@\"); fi ; ++ local retval=$~a ; ++ unset SCM_ARGS ; ++ return $retval ; + }" + symbol special-varname)))) + +-- +2.31.0 + -- 2.31.0