fixes the dryRun

Author: taukakao

cmd/kargs.go

@@ -70,7 +70,7 @@ func kargs(cmd *cobra.Command, args []string) error {
 			cmdr.Error.Println(err)
 			return err
 		}
-		err = aBsys.RunOperation(core.APPLY, false)
+		err = aBsys.RunOperation(core.APPLY, false, false)
 		if err != nil {
 			cmdr.Error.Println(abroot.Trans("pkg.applyFailed"))
 			return err

cmd/pkg.go

@@ -204,11 +204,7 @@ func pkg(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		if dryRun {
-			err = aBsys.RunOperation(core.DRY_RUN_APPLY, deleteOldSystem)
-		} else {
-			err = aBsys.RunOperation(core.APPLY, deleteOldSystem)
-		}
+		err = aBsys.RunOperation(core.APPLY, deleteOldSystem, dryRun)
 		if err != nil {
 			cmdr.Error.Printf(abroot.Trans("pkg.applyFailed"), err)
 			return err

cmd/rebase.go

@@ -129,10 +129,6 @@ func rebase(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if dryRun {
-		cmdr.Info.Println(abroot.Trans("rebase.dryRunSuccess"))
-	}
-
 	rebaseOnly, err := cmd.Flags().GetBool("rebase-only")
 	if err != nil {
 		cmdr.Error.Println(err)
@@ -144,5 +140,5 @@ func rebase(cmd *cobra.Command, args []string) error {
 	}
 
 	cmdr.Info.Println(abroot.Trans("rebase.successUpdate"))
-	return abSys.RunOperation("UPGRADE", false)
+	return abSys.RunOperation("UPGRADE", false, dryRun)
 }

cmd/update-initramfs.go

@@ -79,11 +79,7 @@ func updateInitramfs(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if dryRun {
-		err = aBsys.RunOperation(core.DRY_RUN_INITRAMFS, deleteOldSystem)
-	} else {
-		err = aBsys.RunOperation(core.INITRAMFS, deleteOldSystem)
-	}
+	err = aBsys.RunOperation(core.INITRAMFS, deleteOldSystem, dryRun)
 	if err != nil {
 		cmdr.Error.Printf(abroot.Trans("updateInitramfs.updateFailed"), err)
 		return err

cmd/upgrade.go

@@ -253,14 +253,12 @@ func upgrade(cmd *cobra.Command, args []string) error {
 	var operation core.ABSystemOperation
 	if force {
 		operation = core.FORCE_UPGRADE
-	} else if dryRun {
-		operation = core.DRY_RUN_UPGRADE
 	} else {
 		operation = core.UPGRADE
 	}
 
 	cmdr.Info.Println(abroot.Trans("upgrade.checkingSystemUpdate"))
-	err = aBsys.RunOperation(operation, deleteOldSystem)
+	err = aBsys.RunOperation(operation, deleteOldSystem, dryRun)
 	if err != nil {
 		if err == core.ErrNoUpdate {
 			cmdr.Info.Println(abroot.Trans("upgrade.noUpdateAvailable"))