Skip to content

Commit 9494a4e

Browse files
remove module firmware index from the codebase
1 parent 1c92949 commit 9494a4e

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

cli/common/common.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,19 @@ func InitIndexes() (*packagemanager.PackageManager, *firmwareindex.Index) {
5959
}
6060

6161
// Load main firmware index and optional additional indexes
62-
firmwareIndex, err := indexes.GetFirmwareIndex(globals.ModuleFirmwareIndexGZURL, true)
62+
pluginFirmwareIndex, err := indexes.GetFirmwareIndex(globals.PluginFirmwareIndexGZURL, true)
6363
if err != nil {
64-
feedback.Fatal(fmt.Sprintf("Can't load firmware index: %s", err), feedback.ErrGeneric)
65-
}
66-
if pluginIndex, err := indexes.GetFirmwareIndex(globals.PluginFirmwareIndexGZURL, true); err != nil {
6764
feedback.Fatal(fmt.Sprintf("Can't load (plugin) firmware index: %s", err), feedback.ErrGeneric)
68-
} else {
69-
firmwareIndex.MergeWith(pluginIndex)
7065
}
7166
for _, additionalURL := range AdditionalFirmwareIndexURLs {
7267
additionalIndex, err := indexes.GetFirmwareIndex(additionalURL, false)
7368
if err != nil {
7469
feedback.Fatal(fmt.Sprintf("Can't load firmware index: %s", err), feedback.ErrGeneric)
7570
}
76-
firmwareIndex.MergeWith(additionalIndex)
71+
pluginFirmwareIndex.MergeWith(additionalIndex)
7772
}
7873

79-
return pmbuilder.Build(), firmwareIndex
74+
return pmbuilder.Build(), pluginFirmwareIndex
8075
}
8176

8277
// CheckFlags runs a basic check, errors if the flags are not defined

cli/globals/globals.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626

2727
var (
2828
PackageIndexGZURL = "https://downloads.arduino.cc/packages/package_index.json.gz"
29-
ModuleFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/module_firmware_index.json.gz"
3029
PluginFirmwareIndexGZURL = "https://downloads.arduino.cc/arduino-fwuploader/boards/plugin_firmware_index.json.gz"
3130
FwUploaderPath = paths.TempDir().Join("fwuploader")
3231
Verbose bool

0 commit comments

Comments
 (0)