From fa0678f5b704adff941b917fab13c361c1f341df Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 2 Aug 2016 12:13:31 +0200 Subject: [PATCH] added 'runtime.tools.packager-name-version.path' property in the global properties map --- arduino-core/src/processing/app/BaseNoGui.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java index 41cf541b5..d6137e7db 100644 --- a/arduino-core/src/processing/app/BaseNoGui.java +++ b/arduino-core/src/processing/app/BaseNoGui.java @@ -867,14 +867,16 @@ public class BaseNoGui { for (ContributedTool tool : installedTools) { File installedFolder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder(); - String absolutePath; + String toolPath; if (installedFolder != null) { - absolutePath = installedFolder.getAbsolutePath(); + toolPath = installedFolder.getAbsolutePath(); } else { - absolutePath = Constants.PREF_REMOVE_PLACEHOLDER; + toolPath = 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", toolPath); + PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", toolPath); + PreferencesData.set(prefix + tool.getPackager() + "-" + tool.getName() + "-" + tool.getVersion() + ".path", + toolPath); } }