rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

Library Manager: some lib names end with numbers, hence separate version with 'version'

Browse Source
This commit is contained in:
Federico Fissore 2015-04-09 15:56:15 +02:00
parent df1b82ac20
commit b35ab60ea2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
View File

@ -100,7 +100,7 @@ public class LibraryInstaller {
public void install(ContributedLibrary lib, ContributedLibrary replacedLib) throws Exception { public void install(ContributedLibrary lib, ContributedLibrary replacedLib) throws Exception {
if (lib.isInstalled()) { if (lib.isInstalled()) {
System.out.println(I18n.format(_("Library is already installed: \"{0}\""), lib.getName() + " " + lib.getParsedVersion())); System.out.println(I18n.format(_("Library is already installed: {0}"), lib.getName() + _(" version ") + lib.getParsedVersion()));
return; return;
} }
@ -108,7 +108,7 @@ public class LibraryInstaller {
// Step 1: Download library // Step 1: Download library
try { try {
downloader.download(lib, progress, I18n.format(_("Downloading library: \"{0}\""), lib.getName())); downloader.download(lib, progress, I18n.format(_("Downloading library: {0}"), lib.getName()));
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Download interrupted... just exit // Download interrupted... just exit
return; return;
@ -119,7 +119,7 @@ public class LibraryInstaller {
// all the temporary folders and abort installation. // all the temporary folders and abort installation.
// Step 2: Unpack library on the correct location // Step 2: Unpack library on the correct location
progress.setStatus(I18n.format(_("Installing library: \"{0}\""), lib.getName())); progress.setStatus(I18n.format(_("Installing library: {0}"), lib.getName()));
onProgress(progress); onProgress(progress);
File libsFolder = indexer.getSketchbookLibrariesFolder(); File libsFolder = indexer.getSketchbookLibrariesFolder();
File tmpFolder = FileUtils.createTempFolderIn(libsFolder); File tmpFolder = FileUtils.createTempFolderIn(libsFolder);
@ -150,7 +150,7 @@ public class LibraryInstaller {
final MultiStepProgress progress = new MultiStepProgress(2); final MultiStepProgress progress = new MultiStepProgress(2);
// Step 1: Remove library // Step 1: Remove library
progress.setStatus(I18n.format(_("Removing library: \"{0}\""), lib.getName())); progress.setStatus(I18n.format(_("Removing library: {0}"), lib.getName()));
onProgress(progress); onProgress(progress);
FileUtils.recursiveDelete(lib.getInstalledFolder()); FileUtils.recursiveDelete(lib.getInstalledFolder());
progress.stepDone(); progress.stepDone();