guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/05: gnu: abcl: Fix quoting in wrapper script.


From: guix-commits
Subject: 03/05: gnu: abcl: Fix quoting in wrapper script.
Date: Fri, 8 Mar 2024 04:18:46 -0500 (EST)

glv pushed a commit to branch master
in repository guix.

commit 56e607efc85e220d89ddf42b8e5ba30dd7f05f16
Author: Paul A. Patience <paul@apatience.com>
AuthorDate: Wed Mar 6 12:06:58 2024 +0000

    gnu: abcl: Fix quoting in wrapper script.
    
    * 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
    Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 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 @@ network protocols, and core version control 
algorithms.")
                                      ":"
                                      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/";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]