Skip to content

Commit 3bce820

Browse files
committed
Command line: added more verbosity and made output coherent
1 parent 8d27171 commit 3bce820

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Diff for: app/src/processing/app/Base.java

+3
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ public Base(String[] args) throws Exception {
360360

361361
Optional<ContributedLibrary> mayInstalled = indexer.getIndex().getInstalled(libraryToInstallParts[0]);
362362
if (mayInstalled.isPresent() && selected.isIDEBuiltIn()) {
363+
System.out.println(tr(I18n
364+
.format("Library {0} is available as built-in in the IDE.\nRemoving the other version {1} installed in the sketchbook...",
365+
library, mayInstalled.get().getParsedVersion())));
363366
libraryInstaller.remove(mayInstalled.get(), progressListener);
364367
} else {
365368
libraryInstaller.install(selected, mayInstalled, progressListener);

Diff for: arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public synchronized void updateIndex(ProgressListener progressListener) throws E
8585

8686
public synchronized void install(ContributedLibrary lib, Optional<ContributedLibrary> mayReplacedLib, ProgressListener progressListener) throws Exception {
8787
if (lib.isLibraryInstalled()) {
88-
System.out.println(I18n.format(tr("Library is already installed: {0} version {1}"), lib.getName(), lib.getParsedVersion()));
88+
System.out.println(I18n.format(tr("Library is already installed: {0}:{1}"), lib.getName(), lib.getParsedVersion()));
8989
return;
9090
}
9191

@@ -106,7 +106,7 @@ public synchronized void install(ContributedLibrary lib, Optional<ContributedLib
106106
// all the temporary folders and abort installation.
107107

108108
// Step 2: Unpack library on the correct location
109-
progress.setStatus(I18n.format(tr("Installing library: {0}"), lib.getName()));
109+
progress.setStatus(I18n.format(tr("Installing library: {0}:{1}"), lib.getName(), lib.getParsedVersion()));
110110
progressListener.onProgress(progress);
111111
File libsFolder = BaseNoGui.getSketchbookLibrariesFolder().folder;
112112
File tmpFolder = FileUtils.createTempFolder(libsFolder);
@@ -139,7 +139,7 @@ public synchronized void remove(ContributedLibrary lib, ProgressListener progres
139139
final MultiStepProgress progress = new MultiStepProgress(2);
140140

141141
// Step 1: Remove library
142-
progress.setStatus(I18n.format(tr("Removing library: {0}"), lib.getName()));
142+
progress.setStatus(I18n.format(tr("Removing library: {0}:{1}"), lib.getName(), lib.getParsedVersion()));
143143
progressListener.onProgress(progress);
144144
FileUtils.recursiveDelete(lib.getInstalledLibrary().get().getInstalledFolder());
145145
progress.stepDone();

0 commit comments

Comments
 (0)