|
74 | 74 | import java.util.stream.Collectors;
|
75 | 75 | import java.util.stream.Stream;
|
76 | 76 |
|
| 77 | +import static processing.app.I18n.format; |
77 | 78 | import static processing.app.I18n.tr;
|
78 | 79 |
|
79 | 80 |
|
@@ -307,9 +308,13 @@ public Base(String[] args) throws Exception {
|
307 | 308 | String[] boardToInstallParts = parser.getBoardToInstall().split(":");
|
308 | 309 |
|
309 | 310 | ContributedPlatform selected = null;
|
310 |
| - if (boardToInstallParts.length == 3 && VersionHelper.valueOf(boardToInstallParts[2]).isPresent()) { |
311 |
| - Version vs = VersionHelper.valueOf(boardToInstallParts[2]).get(); |
312 |
| - selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], vs.toString()); |
| 311 | + if (boardToInstallParts.length == 3) { |
| 312 | + Optional<Version> version = VersionHelper.valueOf(boardToInstallParts[2]); |
| 313 | + if (!version.isPresent()) { |
| 314 | + System.out.println(format(tr("Invalid version {0}"), boardToInstallParts[2])); |
| 315 | + System.exit(1); |
| 316 | + } |
| 317 | + selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], version.get().toString()); |
313 | 318 | } else if (boardToInstallParts.length == 2) {
|
314 | 319 | List<ContributedPlatform> platformsByName = indexer.getIndex().findPlatforms(boardToInstallParts[0], boardToInstallParts[1]);
|
315 | 320 | Collections.sort(platformsByName, new DownloadableContributionVersionComparator());
|
@@ -350,7 +355,12 @@ public Base(String[] args) throws Exception {
|
350 | 355 |
|
351 | 356 | ContributedLibrary selected = null;
|
352 | 357 | if (libraryToInstallParts.length == 2) {
|
353 |
| - selected = indexer.getIndex().find(libraryToInstallParts[0], VersionHelper.valueOf(libraryToInstallParts[1]).toString()); |
| 358 | + Optional<Version> version = VersionHelper.valueOf(libraryToInstallParts[1]); |
| 359 | + if (!version.isPresent()) { |
| 360 | + System.out.println(format(tr("Invalid version {0}"), libraryToInstallParts[1])); |
| 361 | + System.exit(1); |
| 362 | + } |
| 363 | + selected = indexer.getIndex().find(libraryToInstallParts[0], version.get().toString()); |
354 | 364 | } else if (libraryToInstallParts.length == 1) {
|
355 | 365 | List<ContributedLibrary> librariesByName = indexer.getIndex().find(libraryToInstallParts[0]);
|
356 | 366 | Collections.sort(librariesByName, new DownloadableContributionVersionComparator());
|
|
0 commit comments