diff mbox series

[bug#69583] gnu: abcl: Fix quoting in wrapper script.

Message ID 1210723121db78c33e4c2e21ece26c5d0353d305.1709726790.git.paul@apatience.com
State New
Headers show
Series [bug#69583] gnu: abcl: Fix quoting in wrapper script. | expand

Commit Message

Paul A. Patience March 6, 2024, 12:06 p.m. UTC 
* 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

Comments

Guillaume Le Vaillant March 8, 2024, 9:20 a.m. UTC | #1 
Patch applied as 56e607efc85e220d89ddf42b8e5ba30dd7f05f16.
Thanks.
diff mbox series

Patch

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/")