Do not consider bundle/custom platforms while installing/upgrading cores

MatteoPologruto · Sep 14, 2018 · daee3c6 · daee3c6
1 parent 4f935b8
commit daee3c6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/commands/commands.go b/commands/commands.go
@@ -67,10 +67,21 @@ var AppName = filepath.Base(os.Args[0])
 
 var Config *configs.Configuration
 
+// InitPackageManagerWithoutBundles initializes the PackageManager
+// but ignores bundles and user installed cores
+func InitPackageManagerWithoutBundles() *packagemanager.PackageManager {
+	logrus.Info("Package manager will scan only managed hardware folder")
+
+	fakeResult := false
+	Config.IDEBundledCheckResult = &fakeResult
+	Config.SketchbookDir = nil
+	return InitPackageManager()
+}
+
 // InitPackageManager initializes the PackageManager
 // TODO: for the daemon mode, this might be called at startup, but for now only commands needing the PM will call it
 func InitPackageManager() *packagemanager.PackageManager {
-	logrus.Info("Loading the default Package index")
+	logrus.Info("Initializing package manager")
 
 	pm := packagemanager.NewPackageManager(
 		Config.IndexesDir(),

diff --git a/commands/core/download.go b/commands/core/download.go
@@ -47,7 +47,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := commands.InitPackageManager()
+	pm := commands.InitPackageManagerWithoutBundles()
 	for _, platformRef := range platformsRefs {
 		downloadPlatformByRef(pm, platformRef)
 	}

diff --git a/commands/core/install.go b/commands/core/install.go
@@ -47,7 +47,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := commands.InitPackageManager()
+	pm := commands.InitPackageManagerWithoutBundles()
 
 	for _, platformRef := range platformsRefs {
 		downloadPlatformByRef(pm, platformRef)

diff --git a/commands/core/uninstall.go b/commands/core/uninstall.go
@@ -44,7 +44,7 @@ func runUninstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := commands.InitPackageManager()
+	pm := commands.InitPackageManagerWithoutBundles()
 
 	for _, platformRef := range platformsRefs {
 		uninstallPlatformByRef(pm, platformRef)

diff --git a/commands/core/upgrade.go b/commands/core/upgrade.go
@@ -46,7 +46,7 @@ func initUpgradeCommand() *cobra.Command {
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core upgrade`")
 
-	pm := commands.InitPackageManager()
+	pm := commands.InitPackageManagerWithoutBundles()
 
 	platformsRefs := parsePlatformReferenceArgs(args)
 	if len(platformsRefs) == 0 {

diff --git a/configs/hardware_directories.go b/configs/hardware_directories.go
@@ -36,8 +36,10 @@ func (config *Configuration) HardwareDirectories() (paths.PathList, error) {
 		res.Add(dir)
 	}
 
-	if dir := config.SketchbookDir.Join("hardware"); dir.IsDir() {
-		res.Add(dir)
+	if config.SketchbookDir != nil {
+		if dir := config.SketchbookDir.Join("hardware"); dir.IsDir() {
+			res.Add(dir)
+		}
 	}
 
 	return res, nil