[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67009] [PATCH v4] build: minetest-build-system: Improve white space
From: |
Tristan Cottam |
Subject: |
[bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field. |
Date: |
Sat, 11 Nov 2023 02:05:08 +0100 |
Fixes certain Minetest mods (such as minetest-ambience) being stored
with a terminating carriage return in their sub-directory base name.
* guix/build/minetest-build-system.scm (name-regexp): Only match
graphical characters in the name sub-match.
Change-Id: I95f4c201724991a10efba5c859bfef99779ea495
---
I'm unsure exactly how I should refer to a Minetest mod which has yet
to be packaged for Guix, so I used the would-be package name of one
such mod, which I will contribute along with many others shortly.
guix/build/minetest-build-system.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/build/minetest-build-system.scm
b/guix/build/minetest-build-system.scm
index 4a7a87ab83..3bf083e004 100644
--- a/guix/build/minetest-build-system.scm
+++ b/guix/build/minetest-build-system.scm
@@ -126,7 +126,8 @@ (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, 2023/11/09
[bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field.,
Tristan Cottam <=