07/07: gnu-maintenance: Support .zip files.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit f5d9604f27bb7e9efcdbd1f384017b9cd9fe89ff
Author: Ludovic Courtès <address@hidden>
Date:   Sat Nov 29 22:14:34 2014 +0100

    gnu-maintenance: Support .zip files.
    
    Reported by Andreas Enge <address@hidden>.
    
    * guix/gnu-maintenance.scm (sans-extension): Add case for ".zip".
      (%tarball-rx): Extend to handle .zip extension.
---
 guix/gnu-maintenance.scm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index ee84446..0528e9f 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -233,12 +233,14 @@ stored."
      (values "ftp.gnu.org" (string-append "/gnu/" project)))))
 
 (define (sans-extension tarball)
-  "Return TARBALL without its .tar.* extension."
-  (let ((end (string-contains tarball ".tar")))
+  "Return TARBALL without its .tar.* or .zip extension."
+  (let ((end (or (string-contains tarball ".tar")
+                 (string-contains tarball ".zip"))))
     (substring tarball 0 end)))
 
 (define %tarball-rx
-  (make-regexp "^(.+)-([0-9]|[^-])*(-src)?\\.tar\\."))
+  ;; Note: .zip files are notably used for freefont-ttf.
+  (make-regexp "^(.+)-([0-9]|[^-])*(-src)?\\.(tar\\.|zip$)"))
 
 (define %alpha-tarball-rx
   (make-regexp 
"^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))