Skip to content

Contributed tools may not be platform-compatible -- this situation cu… #5138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kevans91 wants to merge 1 commit into from
Closed

Contributed tools may not be platform-compatible -- this situation cu… #5138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions arduino-core/src/processing/app/BaseNoGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import cc.arduino.Compiler;
import cc.arduino.Constants;
import cc.arduino.UploaderUtils;
import cc.arduino.contributions.DownloadableContribution;
import cc.arduino.contributions.GPGDetachedSignatureVerifier;
import cc.arduino.contributions.SignatureVerificationFailedException;
import cc.arduino.contributions.libraries.LibrariesIndexer;
Expand Down Expand Up @@ -853,15 +854,18 @@ public static void createToolPreferences(Collection<ContributedTool> installedTo
}

for (ContributedTool tool : installedTools) {
File installedFolder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder();
String absolutePath;
if (installedFolder != null) {
absolutePath = installedFolder.getAbsolutePath();
} else {
absolutePath = Constants.PREF_REMOVE_PLACEHOLDER;
DownloadableContribution dlContrib = tool.getDownloadableContribution(getPlatform());
if (dlContrib != null) {
File installedFolder = dlContrib.getInstalledFolder();
String absolutePath;
if (installedFolder != null) {
absolutePath = installedFolder.getAbsolutePath();
} else {
absolutePath = Constants.PREF_REMOVE_PLACEHOLDER;
}
PreferencesData.set(prefix + tool.getName() + ".path", absolutePath);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", absolutePath);
}
PreferencesData.set(prefix + tool.getName() + ".path", absolutePath);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", absolutePath);
}
}

Expand Down