37/155: import cran: Remove more invalid characters from package names.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 38c48056858bd2f5993042df537b26317516fc73
Author: Ricardo Wurmus <address@hidden>
Date:   Tue May 17 15:06:44 2016 +0200

    import cran: Remove more invalid characters from package names.
    
    * guix/import/cran.scm (guix-name): Replace period and underscore with
      dash; always prepend package names with "r-".
---
 guix/import/cran.scm |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d2add6f..ee34ead 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -152,9 +152,11 @@ empty list when the FIELD cannot be found."
   "Return the `package' s-expression for an R package published on REPOSITORY
 from the alist META, which was derived from the R package's DESCRIPTION file."
   (define (guix-name name)
-    (if (string-prefix? "r-" name)
-        (string-downcase name)
-        (string-append "r-" (string-downcase name))))
+    (string-append "r-" (string-map (match-lambda
+                                      (#\_ #\-)
+                                      (#\. #\-)
+                                      (chr (char-downcase chr)))
+                                    name)))
 
   (let* ((base-url   (case repository
                        ((cran)         %cran-url)