From 3da201aa39375888cf6432eef946a744f9e0ce33 Mon Sep 17 00:00:00 2001
From: Boni Garcia <bgarcia@gsyc.es>
Date: Mon, 12 Mar 2018 15:40:21 +0100
Subject: [PATCH] Bug-fix: honor forceDownload() option (related to #186)

---
 src/main/java/io/github/bonigarcia/wdm/Downloader.java     | 7 ++++++-
 .../java/io/github/bonigarcia/wdm/WebDriverManager.java    | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/github/bonigarcia/wdm/Downloader.java b/src/main/java/io/github/bonigarcia/wdm/Downloader.java
index 6140c4c66..7c66d59f0 100644
--- a/src/main/java/io/github/bonigarcia/wdm/Downloader.java
+++ b/src/main/java/io/github/bonigarcia/wdm/Downloader.java
@@ -118,7 +118,12 @@ private Optional<File> downloadAndExtract(URL url, File targetFile,
             extractedFile = temporaryFile;
         }
         File resultingBinary = new File(targetFolder, extractedFile.getName());
-        if (!resultingBinary.exists()) {
+        boolean binaryExists = resultingBinary.exists();
+        if (!binaryExists || config().isOverride()) {
+            if (binaryExists) {
+                log.debug("Overriding former binary {}", resultingBinary);
+                deleteFile(resultingBinary);
+            }
             moveFileToDirectory(extractedFile, targetFolder, true);
         }
         if (!config().isExecutable(resultingBinary)) {
diff --git a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
index 7fd24c88a..da79ae644 100644
--- a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
+++ b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
@@ -376,14 +376,14 @@ protected void manage(Architecture arch, String version) {
             boolean cache = config().isForceCache() || !isNetAvailable();
 
             String driverNameString = listToString(getDriverName());
-            log.trace(">> Managing {} arch={} version={} getLatest={} cache={}",
+            log.trace("Managing {} arch={} version={} getLatest={} cache={}",
                     driverNameString, arch, version, getLatest, cache);
 
             Optional<String> driverInCache = handleCache(arch, version,
                     getLatest, cache);
 
             String versionStr = getLatest ? "(latest version)" : version;
-            if (driverInCache.isPresent()) {
+            if (driverInCache.isPresent() && !config().isOverride()) {
                 versionToDownload = version;
                 downloadedVersion = version;
                 log.debug("Driver for {} {} found in cache {}",