Fix problem with zip_datafiles() when files in subdir

- Fixes Issue rqtl#102
kbroman · Feb 16, 2019 · d5eb237 · d5eb237
1 parent 393b00f
commit d5eb237
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: qtl2
-Version: 0.18
-Date: 2019-02-08
+Version: 0.19-1
+Date: 2019-02-16
 Title: Quantitative Trait Locus Mapping in Experimental Crosses
 Description: R/qtl2 provides a set of tools to perform quantitative
     trait locus (QTL) analysis in experimental crosses. It is a

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+## qtl2 0.19-1 (2019-02-16)
+
+### Bug fixes
+
+- Fix bug in `zip_datafiles()` when the files are in a subdirectory.
+  (See [Issue #102](https://github.com/rqtl/qtl2/issues/102).)
+
+
 ## qtl2 0.18 (2019-02-08)
 
 ### New features

diff --git a/R/zip_datafiles.R b/R/zip_datafiles.R
@@ -47,8 +47,9 @@ function(control_file, zip_file=NULL, overwrite=FALSE, quiet=TRUE)
 
     dir <- dirname(control_file)
 
-    if(is.null(zip_file))
-        zip_file <- sub("\\.[a-z]+$", ".zip", control_file)
+    if(is.null(zip_file)) {
+        zip_file <- sub("\\.[a-z]+$", ".zip", basename(control_file))
+    }
 
     # read control file
     control <-  read_control_file(control_file)