default url shouldnt be added to additional_urls

arduino · Nov 18, 2019 · 5146384 · 5146384
1 parent 5e8fabf
commit 5146384
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/cli/globals/globals.go b/cli/globals/globals.go
@@ -30,8 +30,8 @@ var (
 	Debug bool
 	// VersionInfo contains all info injected during build
 	VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
-	// AdditionalUrls contains the list of additional urls the boards manager can use
-	AdditionalUrls []string
+	// DefaultIndexURL is the default index url
+	DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.json"
 	// LogLevel is temporarily exported because the compile command will
 	// forward this information to the underlying legacy package
 	LogLevel string

diff --git a/cli/instance/instance.go b/cli/instance/instance.go
@@ -61,11 +61,7 @@ func initInstance() *rpc.InitResp {
 }
 
 func packageManagerInitReq() *rpc.InitReq {
-	urls := []string{}
-
-	for _, urlString := range globals.AdditionalUrls {
-		urls = append(urls, urlString)
-	}
+	urls := []string{globals.DefaultIndexURL}
 
 	for _, URL := range viper.GetStringSlice("board_manager.additional_urls") {
 		urls = append(urls, URL)

diff --git a/commands/instances.go b/commands/instances.go
@@ -31,6 +31,7 @@ import (
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
+	"github.com/arduino/arduino-cli/cli/globals"
 	"github.com/arduino/arduino-cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	paths "github.com/arduino/go-paths-helper"
@@ -195,7 +196,9 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexReq, downloadCB Downlo
 	}
 
 	indexpath := paths.New(viper.GetString("directories.Data"))
-	for _, u := range viper.GetStringSlice("board_manager.additional_urls") {
+	urls := []string{globals.DefaultIndexURL}
+	urls = append(urls, viper.GetStringSlice("board_manager.additional_urls")...)
+	for _, u := range urls {
 		URL, err := url.Parse(u)
 		if err != nil {
 			logrus.Warnf("unable to parse additional URL: %s", u)
@@ -275,7 +278,9 @@ func createInstance(ctx context.Context, getLibOnly bool) (
 			downloadsDir,
 			dataDir.Join("tmp"))
 
-		for _, u := range viper.GetStringSlice("board_manager.additional_urls") {
+		urls := []string{globals.DefaultIndexURL}
+		urls = append(urls, viper.GetStringSlice("board_manager.additional_urls")...)
+		for _, u := range urls {
 			URL, err := url.Parse(u)
 			if err != nil {
 				logrus.Warnf("unable to parse additional URL: %s", u)