Added --skip-post-install flags. Refactored PostInstall function.

Author: cmaglie

arduino/cores/packagemanager/install_uninstall.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/executils"
-	"github.com/arduino/go-paths-helper"
 	"github.com/pkg/errors"
 )
 
@@ -35,33 +34,31 @@ func (pm *PackageManager) InstallPlatform(platformRelease *cores.PlatformRelease
 	if err := platformRelease.Resource.Install(pm.DownloadDir, pm.TempDir, destDir); err != nil {
 		return errors.Errorf("installing platform %s: %s", platformRelease, err)
 	}
-
-	// Perform post install
-	if platformRelease.IsTrusted {
-		if err := pm.runPostInstallScript(destDir); err != nil {
-			return errors.Errorf("running post install script for %s: %s", platformRelease, err)
-		}
+	if d, err := destDir.Abs(); err == nil {
+		platformRelease.InstallDir = d
+	} else {
+		return err
 	}
-
 	return nil
 }
 
-func (pm *PackageManager) runPostInstallScript(destDir *paths.Path) error {
-	absDestDir, err := destDir.Abs()
-	if err != nil {
-		return err
+// RunPostInstallScript runs the post_install.sh (or post_install.bat) script for the
+// specified platformRelease.
+func (pm *PackageManager) RunPostInstallScript(platformRelease *cores.PlatformRelease) error {
+	if !platformRelease.IsInstalled() {
+		return errors.New("platform not installed")
 	}
 	postInstallFilename := "post_install.sh"
 	if runtime.GOOS == "windows" {
 		postInstallFilename = "post_install.bat"
 	}
-	postInstall := absDestDir.Join(postInstallFilename)
+	postInstall := platformRelease.InstallDir.Join(postInstallFilename)
 	if postInstall.Exist() && postInstall.IsNotDir() {
 		cmd, err := executils.Command(postInstall.String())
 		if err != nil {
 			return err
 		}
-		cmd.Dir = absDestDir.String()
+		cmd.Dir = platformRelease.InstallDir.String()
 		cmd.Stdout = nil
 		cmd.Stderr = nil
 		if err := cmd.Run(); err != nil {

cli/core/install.go

@@ -42,9 +42,14 @@ func initInstallCommand() *cobra.Command {
 		Args: cobra.MinimumNArgs(1),
 		Run:  runInstallCommand,
 	}
+	installCommand.Flags().BoolVar(&installFlags.skipPostInstall, "skip-post-install", false, "Do not run post-install scripts.")
 	return installCommand
 }
 
+var installFlags struct {
+	skipPostInstall bool
+}
+
 func runInstallCommand(cmd *cobra.Command, args []string) {
 	inst, err := instance.CreateInstance()
 	if err != nil {
@@ -66,6 +71,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 			PlatformPackage: platformRef.PackageName,
 			Architecture:    platformRef.Architecture,
 			Version:         platformRef.Version,
+			SkipPostInstall: installFlags.skipPostInstall,
 		}
 		_, err := core.PlatformInstall(context.Background(), platformInstallReq, output.ProgressBar(), output.TaskProgress())
 		if err != nil {

cli/core/upgrade.go

@@ -42,9 +42,14 @@ func initUpgradeCommand() *cobra.Command {
 			"  " + os.Args[0] + " core upgrade arduino:samd",
 		Run: runUpgradeCommand,
 	}
+	upgradeCommand.Flags().BoolVar(&upgradeFlags.skipPostInstall, "skip-post-install", false, "Do not run post-install scripts.")
 	return upgradeCommand
 }
 
+var upgradeFlags struct {
+	skipPostInstall bool
+}
+
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
 	inst, err := instance.CreateInstance()
 	if err != nil {
@@ -91,6 +96,7 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
 			Instance:        inst,
 			PlatformPackage: platformRef.PackageName,
 			Architecture:    platformRef.Architecture,
+			SkipPostInstall: upgradeFlags.skipPostInstall,
 		}
 
 		_, err := core.PlatformUpgrade(context.Background(), r, output.ProgressBar(), output.TaskProgress())

commands/core/install.go

@@ -17,13 +17,13 @@ package core
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	"github.com/pkg/errors"
 )
 
 // PlatformInstall FIXMEDOC
@@ -49,7 +49,7 @@ func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallReq,
 		return nil, fmt.Errorf("finding platform dependencies: %s", err)
 	}
 
-	err = installPlatform(pm, platform, tools, downloadCB, taskCB)
+	err = installPlatform(pm, platform, tools, downloadCB, taskCB, req.GetSkipPostInstall())
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +64,8 @@ func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallReq,
 
 func installPlatform(pm *packagemanager.PackageManager,
 	platformRelease *cores.PlatformRelease, requiredTools []*cores.ToolRelease,
-	downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB) error {
+	downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB,
+	skipPostInstall bool) error {
 	log := pm.Log.WithField("platform", platformRelease)
 
 	// Prerequisite checks before install
@@ -138,6 +139,14 @@ func installPlatform(pm *packagemanager.PackageManager,
 		}
 	}
 
+	// Perform post install
+	if !skipPostInstall && platformRelease.IsTrusted {
+		log.Info("Running post_install script")
+		if err := pm.RunPostInstallScript(platformRelease); err != nil {
+			return errors.Errorf("running post install: %s", err)
+		}
+	}
+
 	log.Info("Platform installed")
 	taskCB(&rpc.TaskProgress{Message: platformRelease.String() + " installed", Completed: true})
 	return nil

commands/core/upgrade.go

@@ -45,7 +45,7 @@ func PlatformUpgrade(ctx context.Context, req *rpc.PlatformUpgradeReq,
 		Package:              req.PlatformPackage,
 		PlatformArchitecture: req.Architecture,
 	}
-	if err := upgradePlatform(pm, ref, downloadCB, taskCB); err != nil {
+	if err := upgradePlatform(pm, ref, downloadCB, taskCB, req.GetSkipPostInstall()); err != nil {
 		return nil, err
 	}
 
@@ -57,7 +57,8 @@ func PlatformUpgrade(ctx context.Context, req *rpc.PlatformUpgradeReq,
 }
 
 func upgradePlatform(pm *packagemanager.PackageManager, platformRef *packagemanager.PlatformReference,
-	downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB) error {
+	downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB,
+	skipPostInstall bool) error {
 	if platformRef.PlatformVersion != nil {
 		return fmt.Errorf("upgrade doesn't accept parameters with version")
 	}
@@ -84,7 +85,7 @@ func upgradePlatform(pm *packagemanager.PackageManager, platformRef *packagemana
 		if err != nil {
 			return fmt.Errorf("platform %s is not installed", platformRef)
 		}
-		err = installPlatform(pm, platform, tools, downloadCB, taskCB)
+		err = installPlatform(pm, platform, tools, downloadCB, taskCB, skipPostInstall)
 		if err != nil {
 			return err
 		}

rpc/commands/core.pb.go

@@ -30,6 +30,8 @@ message PlatformInstallReq {
 	string architecture = 3;
 	// Platform version to install.
 	string version = 4;
+	// Set to true to not run (eventual) post install scripts for trusted platforms
+	bool skipPostInstall = 5;
 }
 
 message PlatformInstallResp {
@@ -75,6 +77,8 @@ message PlatformUpgradeReq {
 	string platform_package  = 2;
 	// Architecture name of the platform (e.g., `avr`).
 	string architecture = 3;
+	// Set to true to not run (eventual) post install scripts for trusted platforms
+	bool skipPostInstall = 4;
 }
 
 message PlatformUpgradeResp {