all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#69583] [PATCH] gnu: abcl: Fix quoting in wrapper script.
@ 2024-03-06 12:06 Paul A. Patience
  2024-03-08  9:20 ` bug#69583: " Guillaume Le Vaillant
  0 siblings, 1 reply; 2+ messages in thread
From: Paul A. Patience @ 2024-03-06 12:06 UTC (permalink / raw)
  To: 69583; +Cc: Paul A. Patience

* 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(-)

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 <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
 ;;;
 ;;; 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/")

base-commit: 86552708c31e628d98f8ca261edb22c01fbd7445
-- 
2.41.0






^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#69583: [PATCH] gnu: abcl: Fix quoting in wrapper script.
  2024-03-06 12:06 [bug#69583] [PATCH] gnu: abcl: Fix quoting in wrapper script Paul A. Patience
@ 2024-03-08  9:20 ` Guillaume Le Vaillant
  0 siblings, 0 replies; 2+ messages in thread
From: Guillaume Le Vaillant @ 2024-03-08  9:20 UTC (permalink / raw)
  To: Paul A. Patience; +Cc: 69583-done

[-- Attachment #1: Type: text/plain, Size: 67 bytes --]

Patch applied as 56e607efc85e220d89ddf42b8e5ba30dd7f05f16.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-08  9:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-06 12:06 [bug#69583] [PATCH] gnu: abcl: Fix quoting in wrapper script Paul A. Patience
2024-03-08  9:20 ` bug#69583: " Guillaume Le Vaillant

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.