always remove non-dirs (pik-piam#74)

orichters · Sep 7, 2023 · 995319e · 995319e
1 parent df81b20
commit 995319e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '3058692'
+ValidationKey: '3078299'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'modelstats: Run Analysis Tools'
-version: 0.15.6
+version: 0.15.7
 date-released: '2023-09-07'
 abstract: A collection of tools to analyze model runs.
 authors:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.15.6
+Version: 0.15.7
 Date: 2023-09-07
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "[email protected]", role = c("aut","cre")),

diff --git a/R/loopRuns.R b/R/loopRuns.R
@@ -29,10 +29,12 @@ loopRuns <- function(mydir, user = NULL, colors = TRUE, sortbytime = TRUE) {
         underline(green("converged")), ", ", blue("converged (had INFES)"), ", ",
         green("finished"), ", ", red("error"), ".\n\n", sep = "")
   }
+  a <- file.info(mydir)
+  a <- a[a[, "isdir"] == TRUE, ]
   if (isTRUE(sortbytime)) {
-    a <- file.info(mydir)
-    a <- a[a[, "isdir"] == TRUE, ]
     mydir <- rownames(a[order(a[, "mtime"], decreasing = TRUE), ])
+  } else {
+    mydir <- rownames(a)
   }
   len <- max(c(15, nchar(basename(normalizePath(mydir, mustWork = FALSE)))))
   len <- min(67, len)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.15.6**
+R package **modelstats**, version **0.15.7**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats)  [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2023). _modelstats: Run Analysis Tools_. R package version 0.15.6, <URL: https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2023). _modelstats: Run Analysis Tools_. R package version 0.15.7, <URL: https://github.com/pik-piam/modelstats>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {modelstats: Run Analysis Tools},
   author = {Anastasis Giannousakis and Oliver Richters},
   year = {2023},
-  note = {R package version 0.15.6},
+  note = {R package version 0.15.7},
   url = {https://github.com/pik-piam/modelstats},
 }
 ```