Emphasize if the version of macOS is supported.

coatless-mac · Dec 7, 2023 · 8292fc6 · 8292fc6
1 parent 85af401
commit 8292fc6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/R/assertions.R b/R/assertions.R
@@ -23,6 +23,12 @@ assert_mac = function(){
     assert(is_macos(), "On macOS")
 }
 
+#' @rdname assert
+#' @export
+assert_macos_supported = function() {
+    assert(is_macos_r_supported(), "On supported macOS version")
+}
+
 #' @rdname assert
 #' @export
 assert_aarch64 = function(){

diff --git a/R/gfortran.R b/R/gfortran.R
@@ -158,6 +158,7 @@ gfortran_version = function() {
 #' @rdname gfortran
 gfortran_install = function(password = getOption("macrtools.password"), verbose = TRUE) {
     assert_mac()
+    assert_macos_supported()
 
     if(isTRUE(is_gfortran_installed())) {
         if(verbose) {
@@ -166,11 +167,6 @@ gfortran_install = function(password = getOption("macrtools.password"), verbose
         return(invisible(TRUE))
     }
 
-    if (!is_macos_r_supported()) {
-        cat("R version", getRversion(),"is not supported. Please upgrade.\n")
-        return(invisible(FALSE))
-    }
-
     if (verbose) {
         cat("\n\nAttempting to download and install gfortran ...\n")
         cat("\nWe expect the installation to take between 2 to 5 minutes.\n\n")