Mercurial > repos > lecorguille > xcms_export_samplemetadata
changeset 5:99a8a4213c4d draft
planemo upload for repository https://github.com/workflow4metabolomics/xcms commit a5136bfc124956893f4f0c91808d1c0d78c4ea01
| author | lecorguille |
|---|---|
| date | Mon, 29 Apr 2019 06:16:09 -0400 |
| parents | b3ecd79c8221 |
| children | bcd7230bb439 |
| files | lib.r macros_xcms.xml |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib.r Fri Feb 08 10:08:21 2019 -0500 +++ b/lib.r Mon Apr 29 06:16:09 2019 -0400 @@ -69,7 +69,7 @@ chromBPI_adjusted_merged <- chromBPI_adjusted } else { if (is(xdata, "XCMSnExp")) xdata_merged <- c(xdata_merged,xdata) - else if (is(xdata, "OnDiskMSnExp")) xdata_merged <- .concatenate_OnDiskMSnExp(xdata_merged,xdata) + else if (is(xdata, "OnDiskMSnExp")) xdata_merged <- xcms:::.concatenate_OnDiskMSnExp(xdata_merged,xdata) else stop("\n\nERROR: The RData either a OnDiskMSnExp object called raw_data or a XCMSnExp object called xdata") singlefile_merged <- c(singlefile_merged,singlefile) @@ -333,7 +333,7 @@ files[exists] <- sub("//","/",files[exists]) # WHAT IS ON THE FILESYSTEM - filesystem_filepaths <- system(paste0("find \"$PWD/",directory,"\" -not -name '\\.*' -not -path '*conda-env*' -type f -name \"*\""), intern=T) + filesystem_filepaths <- system(paste0("find \"",getwd(),"/",directory,"\" -not -name '\\.*' -not -path '*conda-env*' -type f -name \"*\""), intern=T) filesystem_filepaths <- filesystem_filepaths[grep(filepattern, filesystem_filepaths, perl=T)] # COMPARISON
--- a/macros_xcms.xml Fri Feb 08 10:08:21 2019 -0500 +++ b/macros_xcms.xml Mon Apr 29 06:16:09 2019 -0400 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <macros> - <token name="@WRAPPER_VERSION@">3.4.3</token> + <token name="@WRAPPER_VERSION@">3.4.4</token> <xml name="requirements"> <requirements> <requirement type="package" version="@WRAPPER_VERSION@">bioconductor-xcms</requirement>