diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index eaaf89bd6..743f839c6 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -360,6 +360,9 @@ public class Base { Optional mayInstalled = indexer.getIndex().getInstalled(libraryToInstallParts[0]); if (mayInstalled.isPresent() && selected.isIDEBuiltIn()) { + System.out.println(tr(I18n + .format("Library {0} is available as built-in in the IDE.\nRemoving the other version {1} installed in the sketchbook...", + library, mayInstalled.get().getParsedVersion()))); libraryInstaller.remove(mayInstalled.get(), progressListener); } else { libraryInstaller.install(selected, mayInstalled, progressListener); diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java b/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java index 7699fd6fa..f06cc736b 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java @@ -85,7 +85,7 @@ public class LibraryInstaller { public synchronized void install(ContributedLibrary lib, Optional mayReplacedLib, ProgressListener progressListener) throws Exception { if (lib.isLibraryInstalled()) { - System.out.println(I18n.format(tr("Library is already installed: {0} version {1}"), lib.getName(), lib.getParsedVersion())); + System.out.println(I18n.format(tr("Library is already installed: {0}:{1}"), lib.getName(), lib.getParsedVersion())); return; } @@ -106,7 +106,7 @@ public class LibraryInstaller { // all the temporary folders and abort installation. // Step 2: Unpack library on the correct location - progress.setStatus(I18n.format(tr("Installing library: {0}"), lib.getName())); + progress.setStatus(I18n.format(tr("Installing library: {0}:{1}"), lib.getName(), lib.getParsedVersion())); progressListener.onProgress(progress); File libsFolder = BaseNoGui.getSketchbookLibrariesFolder().folder; File tmpFolder = FileUtils.createTempFolder(libsFolder); @@ -139,7 +139,7 @@ public class LibraryInstaller { final MultiStepProgress progress = new MultiStepProgress(2); // Step 1: Remove library - progress.setStatus(I18n.format(tr("Removing library: {0}"), lib.getName())); + progress.setStatus(I18n.format(tr("Removing library: {0}:{1}"), lib.getName(), lib.getParsedVersion())); progressListener.onProgress(progress); FileUtils.recursiveDelete(lib.getInstalledLibrary().get().getInstalledFolder()); progress.stepDone();