From patchwork Wed Mar 6 12:06:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 61407 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 70E2927BBE2; Wed, 6 Mar 2024 12:07:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 AAD8427BBE9 for ; Wed, 6 Mar 2024 12:07:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhq3c-0002I5-Eb; Wed, 06 Mar 2024 07:07:36 -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 1rhq3Y-0002Ft-EX for guix-patches@gnu.org; Wed, 06 Mar 2024 07:07:32 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhq3Y-0007pd-6H for guix-patches@gnu.org; Wed, 06 Mar 2024 07:07:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhq42-0001Rw-JG for guix-patches@gnu.org; Wed, 06 Mar 2024 07:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69583] [PATCH] gnu: abcl: Fix quoting in wrapper script. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 12:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69583 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69583@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17097268795561 (code B ref -1); Wed, 06 Mar 2024 12:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2024 12:07:59 +0000 Received: from localhost ([127.0.0.1]:49963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhq3y-0001Rc-RN for submit@debbugs.gnu.org; Wed, 06 Mar 2024 07:07:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:39284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhq3x-0001RV-1Y for submit@debbugs.gnu.org; Wed, 06 Mar 2024 07:07:58 -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 1rhq3P-000240-T8 for guix-patches@gnu.org; Wed, 06 Mar 2024 07:07:24 -0500 Received: from mail-40136.proton.ch ([185.70.40.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhq3M-0007lY-KP for guix-patches@gnu.org; Wed, 06 Mar 2024 07:07:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1709726837; x=1709986037; bh=rpIHrZvpyCTmPthsIuKwsKShkxQYUPgb8NE/yPfeqKs=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Fri5sz1yxvUC+y88efp7SIyhfWqKkdJ0AkPuj9aCxjEoQl/MuDTaan0gcKmHXyYuL m2OavdQF5cdTJei2MC80AEUVMuulc4JF0MjECA/dGzL6sWmUlfo+xwpZ3C0CBvZGKb Pzp0SODyBfkPz6wqk5QrVfdd0pqMaDj+dVNn8BRGO4wL8BvHBLeRlkf0sTj2nHxkCA I78ShVYehfIM8qqbTeKNrLpE3kUqO4rjXe0kAHKyfHTjtDVnNBdYuCcOKR+ravRNpY va9+NOI2somX6MyjZN2RJx1x0xGFKidTyyVL3oyBeDXSF4vEs5wV9eF3mnmq4wfPPb rz9vDCsy6wsxQ== Date: Wed, 06 Mar 2024 12:06:58 +0000 From: "Paul A. Patience" Message-ID: <1210723121db78c33e4c2e21ece26c5d0353d305.1709726790.git.paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.136; envelope-from=paul@apatience.com; helo=mail-40136.proton.ch 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, SPF_HELO_PASS=-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: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (abcl)[arguments]<#:phases>: Fix quoting in installed wrapper script. Also set hash-bang to bash since '[[' is used. Change-Id: I09ee266764c455194ab6097f096378ee1a986bcb --- gnu/packages/java.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 86552708c31e628d98f8ca261edb22c01fbd7445 diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8be5d98a77..151fc8aa89 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2024 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -13578,14 +13579,14 @@ (define-public abcl ":" share "abcl-contrib.jar"))) (display (string-append - "#!" (which "sh") "\n" + "#!" (which "bash") "\n" "if [[ -z $CLASSPATH ]]; then\n" " cp=\"" classpath "\"\n" "else\n" " cp=\"" classpath ":$CLASSPATH\"\n" "fi\n" "exec " (which "java") - " -cp $cp org.armedbear.lisp.Main $@\n"))))) + " -cp \"$cp\" org.armedbear.lisp.Main \"$@\"\n"))))) (chmod (string-append bin "abcl") #o755) #t)))))) (home-page "https://abcl.org/")