~ruther/guix-local

9ce47b6fdd742324f3e7a47fa09b54f6b613b52f — Tristan Cottam 2 years ago 42316ac
build: minetest-build-system: Match name more strictly.

Some Minetest mods, such as the hitherto unpackaged minetest-ambience,
have trailing garbage space (e.g. carriage returns) in their name line,
that would otherwise end up as part of the mod's directory name.

* guix/build/minetest-build-system.scm (name-regexp): Only match
graphical characters in the name sub-match.

Change-Id: I95f4c201724991a10efba5c859bfef99779ea495
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
1 files changed, 2 insertions(+), 1 deletions(-)

M guix/build/minetest-build-system.scm
M guix/build/minetest-build-system.scm => guix/build/minetest-build-system.scm +2 -1
@@ 126,7 126,8 @@ If it is unknown, make an educated guess."
                   (/ 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