Removed some duplicated code

Author: silvanocerza

cli/core/install.go

@@ -43,7 +43,7 @@ func initInstallCommand() *cobra.Command {
 		Args: cobra.MinimumNArgs(1),
 		Run:  runInstallCommand,
 	}
-	addPostInstallFlagsToCommand(installCommand)
+	AddPostInstallFlagsToCommand(installCommand)
 	return installCommand
 }
 
@@ -52,12 +52,15 @@ var postInstallFlags struct {
 	skipPostInstall bool
 }
 
-func addPostInstallFlagsToCommand(cmd *cobra.Command) {
+// AddPostInstallFlagsToCommand adds flags that can be used to force running or skipping
+// of post installation scripts
+func AddPostInstallFlagsToCommand(cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&postInstallFlags.runPostInstall, "run-post-install", false, "Force run of post-install scripts (if the CLI is not running interactively).")
 	cmd.Flags().BoolVar(&postInstallFlags.skipPostInstall, "skip-post-install", false, "Force skip of post-install scripts (if the CLI is running interactively).")
 }
 
-func detectSkipPostInstallValue() bool {
+// DetectSkipPostInstallValue returns true if a post install script must be run
+func DetectSkipPostInstallValue() bool {
 	if postInstallFlags.runPostInstall && postInstallFlags.skipPostInstall {
 		feedback.Errorf("The flags --run-post-install and --skip-post-install can't be both set at the same time.")
 		os.Exit(errorcodes.ErrBadArgument)
@@ -100,7 +103,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 			PlatformPackage: platformRef.PackageName,
 			Architecture:    platformRef.Architecture,
 			Version:         platformRef.Version,
-			SkipPostInstall: detectSkipPostInstallValue(),
+			SkipPostInstall: DetectSkipPostInstallValue(),
 		}
 		_, err := core.PlatformInstall(context.Background(), platformInstallReq, output.ProgressBar(), output.TaskProgress())
 		if err != nil {

cli/core/upgrade.go

@@ -42,7 +42,7 @@ func initUpgradeCommand() *cobra.Command {
 			"  " + os.Args[0] + " core upgrade arduino:samd",
 		Run: runUpgradeCommand,
 	}
-	addPostInstallFlagsToCommand(upgradeCommand)
+	AddPostInstallFlagsToCommand(upgradeCommand)
 	return upgradeCommand
 }
 
@@ -92,7 +92,7 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
 			Instance:        inst,
 			PlatformPackage: platformRef.PackageName,
 			Architecture:    platformRef.Architecture,
-			SkipPostInstall: detectSkipPostInstallValue(),
+			SkipPostInstall: DetectSkipPostInstallValue(),
 		}
 
 		_, err := core.PlatformUpgrade(context.Background(), r, output.ProgressBar(), output.TaskProgress())

cli/upgrade/upgrade.go

@@ -19,12 +19,12 @@ import (
 	"context"
 	"os"
 
+	"github.com/arduino/arduino-cli/cli/core"
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/cli/output"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/configuration"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -35,28 +35,6 @@ var postInstallFlags struct {
 	skipPostInstall bool
 }
 
-func detectSkipPostInstallValue() bool {
-	if postInstallFlags.runPostInstall && postInstallFlags.skipPostInstall {
-		feedback.Errorf("The flags --run-post-install and --skip-post-install can't be both set at the same time.")
-		os.Exit(errorcodes.ErrBadArgument)
-	}
-	if postInstallFlags.runPostInstall {
-		logrus.Info("Will run post-install by user request")
-		return false
-	}
-	if postInstallFlags.skipPostInstall {
-		logrus.Info("Will skip post-install by user request")
-		return true
-	}
-
-	if !configuration.IsInteractive {
-		logrus.Info("Not running from console, will skip post-install by default")
-		return true
-	}
-	logrus.Info("Running from console, will run post-install by default")
-	return false
-}
-
 // NewCommand creates a new `upgrade` command
 func NewCommand() *cobra.Command {
 	upgradeCommand := &cobra.Command{
@@ -68,8 +46,7 @@ func NewCommand() *cobra.Command {
 		Run:     runUpgradeCommand,
 	}
 
-	upgradeCommand.Flags().BoolVar(&postInstallFlags.runPostInstall, "run-post-install", false, "Force run of post-install scripts (if the CLI is not running interactively).")
-	upgradeCommand.Flags().BoolVar(&postInstallFlags.skipPostInstall, "skip-post-install", false, "Force skip of post-install scripts (if the CLI is running interactively).")
+	core.AddPostInstallFlagsToCommand(upgradeCommand)
 	return upgradeCommand
 }
 
@@ -84,7 +61,7 @@ func runUpgradeCommand(cmd *cobra.Command, args []string) {
 
 	err = commands.Upgrade(context.Background(), &rpc.UpgradeReq{
 		Instance:        inst,
-		SkipPostInstall: detectSkipPostInstallValue(),
+		SkipPostInstall: core.DetectSkipPostInstallValue(),
 	}, output.NewDownloadProgressBarCB(), output.TaskProgress())
 
 	if err != nil {

commands/instances.go

@@ -568,6 +568,7 @@ func Upgrade(ctx context.Context, req *rpc.UpgradeReq, downloadCB DownloadProgre
 					if err := pm.UninstallPlatform(latest); err != nil {
 						logrus.WithError(err).Error("Error rolling-back changes.")
 						taskCB(&rpc.TaskProgress{Message: "Error rolling-back changes: " + err.Error()})
+						return err
 					}
 				}
 

rpc/commands/commands.pb.go

@@ -222,7 +222,7 @@ message UpgradeReq {
   // Arduino Core Service instance from the Init response.
   Instance instance = 1;
 
-  // Set to true to not run (eventual) post install scripts for trusted platforms
+  // Set to true to not run (eventual) post install scripts
   bool skipPostInstall = 2;
 }