Combine os.unix.R and os.windows.R in one os.R

ices-tools-prod · Jan 7, 2019 · b4a9d2f · b4a9d2f
1 parent 26125c2
commit b4a9d2f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: icesTAF
 Version: 2.1-0
-Date: 2019-01-04
+Date: 2019-01-07
 Title: Functions to Support the ICES Transparent Assessment Framework
 Authors@R: c(person("Arni", "Magnusson", role=c("aut","cre"), email="[email protected]"),
              person("Colin", "Millar", role="aut"))

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-icesTAF 2.1-0 (2019-01-04)
+icesTAF 2.1-0 (2019-01-07)
 --------------------------------------------------------------------------------
 o Added function taf.bootstrap() to set up data files and software.
 

diff --git a/R/os.unix.R → R/os.R b/R/os.unix.R → R/os.R
@@ -21,3 +21,12 @@ os.unix <- function()
 {
   .Platform$OS.type == "unix"
 }
+
+#' @rdname os.unix
+#'
+#' @export
+
+os.windows <- function()
+{
+  .Platform$OS.type == "windows"
+}
diff --git a/R/os.windows.R b/R/os.windows.R
diff --git a/man/os.unix.Rd b/man/os.unix.Rd