[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67009] [PATCH v2] build: minetest-build-system: Improve white space
From: |
Tristan Cottam |
Subject: |
[bug#67009] [PATCH v2] build: minetest-build-system: Improve white space handling in mod name field. |
Date: |
Thu, 9 Nov 2023 11:43:01 +0100 |
On Thursday, November 9th, 2023 at 7:06 AM, Liliana Marie Prikler
<liliana.prikler@gmail.com> wrote:
> > The new regexp is missing a terminator ($). Should we add
> > [[:space:]]$ at the end?
>
> Ahem, [[:space:]]*$ of course.
I didn't include [[:space:]]*$ in case someone decided to append a
comment to the same line. However, since Minetest doesn't officially
support comments in mod.conf, I think it's safe to include [[:space:]]*$
for clarity.
* guix/build/minetest-build-system.scm (name-regexp): Improve white
space handling.
Change-Id: I95f4c201724991a10efba5c859bfef99779ea495
---
guix/build/minetest-build-system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/build/minetest-build-system.scm
b/guix/build/minetest-build-system.scm
index 4a7a87ab83..cfeca7d18f 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -126,7 +126,7 @@ (define* (minimise-png #:key inputs native-inputs
#:allow-other-keys)
(/ total-old-size (expt 1024 2))
(/ total-new-size (expt 1024 2)))))))
-(define name-regexp (make-regexp "^name[ ]*=(.+)$"))
+(define name-regexp (make-regexp
"^name[[:space:]]*=[[:space:]]*([[:graph:]]+)[[:space:]]*$"))
(define* (read-mod-name mod.conf #:optional not-found)
"Read the name of a mod from MOD.CONF. If MOD.CONF
base-commit: b0bfddd7f937fcefdaeb1de4ccafd415c1df4122
--
2.41.0
[bug#67009] [PATCH v2] build: minetest-build-system: Improve white space handling in mod name field.,
Tristan Cottam <=
[bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field., Tristan Cottam, 2023/11/10