# HG changeset patch # User lecorguille # Date 1556532969 14400 # Node ID 99a8a4213c4dbf02f50382817da28da90625ddbe # Parent b3ecd79c822164b2f14ed7d264409f62eacfaac5 planemo upload for repository https://github.com/workflow4metabolomics/xcms commit a5136bfc124956893f4f0c91808d1c0d78c4ea01 diff -r b3ecd79c8221 -r 99a8a4213c4d lib.r --- 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 diff -r b3ecd79c8221 -r 99a8a4213c4d macros_xcms.xml --- 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 @@ - 3.4.3 + 3.4.4 bioconductor-xcms