add force argument to java unpack and install (#86)

* add force argument to java unpack and install

* Update R/java_install.R

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: e-kotov

R/java_install.R

@@ -1,11 +1,12 @@
 #' Install Java from a distribution file
-#'
+#' 
 #' @description
 #' Unpack Java distribution file into cache directory and link the installation into a project directory, optionally setting the `JAVA_HOME` and `PATH` environment variables to the Java version that was just installed.
 #'
 #' @param java_distrib_path A `character` vector of length 1 containing the path to the Java distribution file.
 #' @param project_path A `character` vector of length 1 containing the project directory where Java should be installed. If not specified or `NULL`, defaults to the current working directory.
 #' @param autoset_java_env A `logical` indicating whether to set the `JAVA_HOME` and `PATH` environment variables to the installed Java directory. Defaults to `TRUE`.
+#' @param force A logical. Whether to overwrite an existing installation. Defaults to `FALSE`.
 #' @inheritParams java_download
 #' @inheritParams global_quiet_param
 #' @return The path to the installed Java directory.
@@ -24,7 +25,8 @@ java_install <- function(
   java_distrib_path,
   project_path = NULL,
   autoset_java_env = TRUE,
-  quiet = FALSE
+  quiet = FALSE,
+  force = FALSE
 ) {
   rje_consent_check()
 
@@ -35,7 +37,8 @@ java_install <- function(
 
   installed_path <- java_unpack(
     java_distrib_path = java_distrib_path,
-    quiet = quiet
+    quiet = quiet,
+    force = force
   )
 
   platforms <- c("windows", "linux", "macos")
@@ -95,19 +98,21 @@ java_install <- function(
       silent = TRUE
     )
     if (!link_success) {
-      if (!quiet)
+      if (!quiet) {
         cli::cli_inform(
           "Junction creation failed. This is likely because the project directory is not on the same disk as the R package cache directory. Java files will instead be copied to {.path {project_version_path}}"
         )
+      }
       dir.create(project_version_path, recursive = TRUE)
       file.copy(
         installed_path,
         project_version_path,
         recursive = TRUE,
         overwrite = TRUE
       )
-      if (!quiet)
+      if (!quiet) {
         cli::cli_inform("Java copied to project {.path {project_version_path}}")
+      }
     }
   } else {
     tryCatch(
@@ -121,18 +126,21 @@ java_install <- function(
         if (!quiet) cli::cli_inform("Warning: {w}")
       },
       error = function(e) {
-        if (!quiet) cli::cli_inform("Error: {e}")
+        if (!quiet) {
+          cli::cli_inform("Error: {e}")
+        }
         dir.create(project_version_path, recursive = TRUE)
         file.copy(
           installed_path,
           project_version_path,
           recursive = TRUE,
           overwrite = TRUE
         )
-        if (!quiet)
+        if (!quiet) {
           cli::cli_inform(
             "Symlink creation failed. Files copied to {.path {project_version_path}}"
           )
+        }
       }
     )
   }
@@ -147,10 +155,11 @@ java_install <- function(
     )
   }
 
-  if (!quiet)
+  if (!quiet) {
     cli::cli_inform(
       "Java {version} ({filename}) for {platform} {arch} installed at {.path {installed_path}} and symlinked to {.path {project_version_path}}",
       .envir = environment()
     )
+  }
   return(installed_path)
 }

R/java_unpack.R

@@ -5,6 +5,7 @@
 #'
 #'
 #' @inheritParams java_install
+#' @param force A logical. Whether to overwrite an existing installation. Defaults to `FALSE`.
 #' @inheritParams global_quiet_param
 #' @return A `character` vector containing of length 1 containing the path to the unpacked Java directory.
 #' @export
@@ -25,7 +26,8 @@
 #'
 java_unpack <- function(
   java_distrib_path,
-  quiet = FALSE
+  quiet = FALSE,
+  force = FALSE
 ) {
   platforms <- c("windows", "linux", "macos")
   architectures <- c("x64", "aarch64", "arm64")
@@ -40,17 +42,29 @@ java_unpack <- function(
   arch <- parts[parts %in% architectures][1]
   platform <- parts[parts %in% platforms][1]
 
-  if (is.na(version))
+  if (is.na(version)) {
     cli::cli_abort("Unable to detect Java version from filename.")
-  if (is.na(arch))
+  }
+  if (is.na(arch)) {
     cli::cli_abort("Unable to detect architecture from filename.")
-  if (is.na(platform))
+  }
+  if (is.na(platform)) {
     cli::cli_abort("Unable to detect platform from filename.")
+  }
 
   # Create the installation path in the package cache
   cache_path <- getOption("rJavaEnv.cache_path")
   installed_path <- file.path(cache_path, "installed", platform, arch, version)
 
+  if (dir.exists(installed_path) && force) {
+    if (!quiet) {
+      cli::cli_inform(
+        "Forced re-installation. Removing existing installation at {.path {installed_path}}"
+      )
+    }
+    unlink(installed_path, recursive = TRUE)
+  }
+
   # Check if the distribution has already been unpacked
   if (!dir.exists(installed_path) || length(list.files(installed_path)) == 0) {
     # Create the directories if they don't exist
@@ -99,10 +113,11 @@ java_unpack <- function(
     # Clean up temporary directory
     unlink(temp_dir, recursive = TRUE)
   } else {
-    if (!quiet)
+    if (!quiet) {
       cli::cli_inform(
         "Java distribution {filename} already unpacked at {.path {installed_path}}"
       )
+    }
   }
   return(installed_path)
 }